From fb07a83b25e227c078c10b96b586ff7e19cb1220 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Fri, 1 Jul 2022 00:19:37 -0700 Subject: [PATCH] v1.0.0 (#173) - Update Changelog - Update Security.MD Co-authored-by: Philip Langer --- .project | 6 ++ CHANGELOG.md | 58 ++++++++++--------- SECURITY.md | 22 +++---- .../META-INF/MANIFEST.MF | 8 +-- .../org.eclipse.glsp.example.workflow/pom.xml | 8 +-- .../META-INF/MANIFEST.MF | 4 +- plugins/org.eclipse.glsp.graph/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 4 +- plugins/org.eclipse.glsp.layout/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 4 +- plugins/org.eclipse.glsp.server.emf/pom.xml | 6 +- .../META-INF/MANIFEST.MF | 6 +- .../org.eclipse.glsp.server.websocket/pom.xml | 4 +- .../META-INF/MANIFEST.MF | 6 +- plugins/org.eclipse.glsp.server/pom.xml | 4 +- pom.xml | 2 +- releng/org.eclipse.glsp.feature/feature.xml | 4 +- releng/org.eclipse.glsp.feature/pom.xml | 2 +- releng/org.eclipse.glsp.repository/pom.xml | 2 +- releng/pom.xml | 2 +- targetplatforms/r2022-03.tpd | 2 +- tests/org.eclipse.glsp.graph.test/pom.xml | 4 +- tests/org.eclipse.glsp.server.test/pom.xml | 4 +- tests/pom.xml | 2 +- 24 files changed, 87 insertions(+), 85 deletions(-) diff --git a/.project b/.project index 7a7e8c57..c21fdcb3 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.m2e.core.maven2Builder @@ -13,5 +18,6 @@ org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c438d75..4de15b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Eclipse GLSP Server Changelog -## v0.1.0 - Upcoming +## [v1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-server/releases/tag/v1.0.0) ### Changes @@ -12,6 +12,8 @@ - [build] Remove dependency to `org.apache.commons.io` [#157](https://github.com/eclipse-glsp/glsp-server/pull/157) - [emf] Inception of new `org.eclipse.glsp.server.emf` package + example models - Provides reusable base classes for EMF-based source models [#159](https://github.com/eclipse-glsp/glsp-server/pull/159) +- [graph] Introduced `GShapePrerenderedElementBuilder` to enable easy construction of shaped prerendered elements eg. foreign object elements. [#168](https://github.com/eclipse-glsp/glsp-server/pull/168) +- [diagram] Fixed a bug that could occur during saving by ensuring that all pending actions are dispatched before a client session is disposed. [#172](https://github.com/eclipse-glsp/glsp-server/pull/172) ### Breaking Changes @@ -35,37 +37,37 @@ ### Changes -- [websocket] Fixed issue that was caused by reusing a shared injector for each client connection [#149](https://github.com/eclipse-glsp/glsp-server/pull/91) -- [navigation] Added a utility class for 'JsonOpenerOptions' [#153](https://github.com/eclipse-glsp/glsp-server/pulls?q=92+93) -- [diagram] Merged the `ServerLayoutConfiguration` API into the `DiagramConfiguration` API. [#123](https://github.com/eclipse-glsp/glsp-server/pull/95) +- [websocket] Fixed issue that was caused by reusing a shared injector for each client connection [#91](https://github.com/eclipse-glsp/glsp-server/pull/91) +- [navigation] Added a utility class for 'JsonOpenerOptions' [#92](https://github.com/eclipse-glsp/glsp-server/pull/92) +- [diagram] Merged the `ServerLayoutConfiguration` API into the `DiagramConfiguration` API. [#95](https://github.com/eclipse-glsp/glsp-server/pull/95) - [model] Reworked model update flow. All aspects of the update process are now handled by the `ModelSubmissionHandler` [#122](https://github.com/eclipse-glsp/glsp-server/pull/95) -- [model] Reworked and split `ModelFactory` API into a dedicated component responsible for loading the model source (`ModelSourceLoader`) and a component responsible for transforming the current modelstate into its GModel-representation (`GModelFactory`) [#119](https://github.com/eclipse-glsp/glsp-server/pull/96) -- [protocol] Added implementation for `SetViewportAction` [#179](https://github.com/eclipse-glsp/glsp-server/pull/99) -- [model] Introduced `GArgumentable` interface which is implemented by all `GModelElement`s. This can be used to provide additional information in form of an `args` map without having to extend the `GModel` type [#194](https://github.com/eclipse-glsp/glsp-server/pull/100) -- [model] Extended default type mapping and added builder for `GArgumentable` elements and corresponding utility classes [#180](https://github.com/eclipse-glsp/glsp-server/pull/105) -- [protocol] Added `fileUri` property to `SaveModelAction` and updated `SaveModelActionHandler` accordingly [#208](https://github.com/eclipse-glsp/glsp-server/pull/103/) -- [protocol] Added optional `reason` string property to `SetDirtyStateAction`. This property indicates the reason that caused to dirty state change and enables more fine granular handling of dirty state changes [#197](https://github.com/eclipse-glsp/glsp-server/pull/101) -- [build] Update dependencies of Google Guava (>= 30.1) and Google Guice (>= 5.0.0). [#260](https://github.com/eclipse-glsp/glsp-server/pull/119) -- [protocol] Refactor the base communication protocol to support initializing and disposing a client session. [#315](https://github.com/eclipse-glsp/glsp-server/pull/123) -- [server] The `org.apache.log4j` dependency is not reexported any more when consumed as p2 artifact. [#430](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/43) -- [di] Complete rework of DI architecture. Move away from one global injector per application. Instead use one global server injector and dedicated child injectors for each diagram session. [#150](https://github.com/eclipse-glsp/glsp-server/pull/127) -- [launch] Improve customizability of `DefaultGLSPServerLauncher`. [#385](https://github.com/eclipse-glsp/glsp-server/pull/128) -- [model] Add properties map in model state to store arbitrary properties that are persistent between handler calls. [#401](https://github.com/eclipse-glsp/glsp-server/pull/132) -- [server] Refactor json-rpc protocol and `DefaultGLSPServerImplementation`. [#421](https://github.com/eclipse-glsp/glsp-server/pull/133) -- [action] Rework `ActionHandler` & `OperationHandler` API. [#425](https://github.com/eclipse-glsp/glsp-server/pull/135) -- [action] Introduce `dispatchAfterNextUpdate` functionality for the `ActionDispatcher`. This enables queuing of actions until the next model updates has been processed. [#448](https://github.com/eclipse-glsp/glsp-server/pull/141/) -- [protocol] Align server-side action definitions with [protocol definition](https://github.com/eclipse-glsp/glsp/blob/master/PROTOCOL.md). [#432](https://github.com/eclipse-glsp/glsp-server/pull/142) +- [model] Reworked and split `ModelFactory` API into a dedicated component responsible for loading the model source (`ModelSourceLoader`) and a component responsible for transforming the current modelstate into its GModel-representation (`GModelFactory`) [#96](https://github.com/eclipse-glsp/glsp-server/pull/96) +- [protocol] Added implementation for `SetViewportAction` [#99](https://github.com/eclipse-glsp/glsp-server/pull/99) +- [model] Introduced `GArgumentable` interface which is implemented by all `GModelElement`s. This can be used to provide additional information in form of an `args` map without having to extend the `GModel` type [#100](https://github.com/eclipse-glsp/glsp-server/pull/100) +- [model] Extended default type mapping and added builder for `GArgumentable` elements and corresponding utility classes [#105](https://github.com/eclipse-glsp/glsp-server/pull/105) +- [protocol] Added `fileUri` property to `SaveModelAction` and updated `SaveModelActionHandler` accordingly [#103](https://github.com/eclipse-glsp/glsp-server/pull/103/) +- [protocol] Added optional `reason` string property to `SetDirtyStateAction`. This property indicates the reason that caused to dirty state change and enables more fine granular handling of dirty state changes [#101](https://github.com/eclipse-glsp/glsp-server/pull/101) +- [build] Update dependencies of Google Guava (>= 30.1) and Google Guice (>= 5.0.0). [#119](https://github.com/eclipse-glsp/glsp-server/pull/119) +- [protocol] Refactor the base communication protocol to support initializing and disposing a client session. [#123](https://github.com/eclipse-glsp/glsp-server/pull/123) +- [server] The `org.apache.log4j` dependency is not reexported any more when consumed as p2 artifact. [#43](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/43) +- [di] Complete rework of DI architecture. Move away from one global injector per application. Instead use one global server injector and dedicated child injectors for each diagram session. [#127](https://github.com/eclipse-glsp/glsp-server/pull/127) +- [launch] Improve customizability of `DefaultGLSPServerLauncher`. [#128](https://github.com/eclipse-glsp/glsp-server/pull/128) +- [model] Add properties map in model state to store arbitrary properties that are persistent between handler calls. [#132](https://github.com/eclipse-glsp/glsp-server/pull/132) +- [server] Refactor json-rpc protocol and `DefaultGLSPServerImplementation`. [#133](https://github.com/eclipse-glsp/glsp-server/pull/133) +- [action] Rework `ActionHandler` & `OperationHandler` API. [#135](https://github.com/eclipse-glsp/glsp-server/pull/135) +- [action] Introduce `dispatchAfterNextUpdate` functionality for the `ActionDispatcher`. This enables queuing of actions until the next model update has been processed. [#141](https://github.com/eclipse-glsp/glsp-server/pull/141/) +- [protocol] Align server-side action definitions with [protocol definition](https://github.com/eclipse-glsp/glsp/blob/master/PROTOCOL.md). [#142](https://github.com/eclipse-glsp/glsp-server/pull/142) ### Breaking Changes -- [diagram] Merged the `ServerLayoutConfiguration` API into the `DiagramConfiguration` API. The standalone `ServerLayoutConfiguration` is now deprecated and no longer supported [#123](https://github.com/eclipse-glsp/glsp-server/pull/95) -- [model] Renamed `ModelFactory` to `ModelSourceLoader` and adapted interface method. This also affects implementing classes like the `JsonFileModelFactory` [#119](https://github.com/eclipse-glsp/glsp-server/pull/96) -- [model] Reworked `ModelSubmissionHandler` API. This includes changes of method names and parameters [#119](https://github.com/eclipse-glsp/glsp-server/pull/96) [#197](https://github.com/eclipse-glsp/glsp-server/pull/101) -- [build] Update dependencies of Google Guava (>= 30.1) and Google Guice (>= 5.0.0). [#260](https://github.com/eclipse-glsp/glsp-server/pull/119) -- [build] The `org.apache.log4j` dependency is not reexported any more when consumed as p2 artifact. You need to import `org.apache.log4j` in your own plugins if you use the log4j API there. [#430](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/43) -- [protocol] Refactor the base communication protocol to support initializing and disposing a client session. Remove now obsolete `InitializeClientSessionAction` and `DisposeClientSessionAction`. [#315](https://github.com/eclipse-glsp/glsp-server/pull/123) -- [di] Complete rework of DI architecture. Your main module now has to extend `DiagramModule` instead of `GLSPModule`. Includes restructurings,cleanups and refactorings that affect most of the API components. [#150](https://github.com/eclipse-glsp/glsp-server/pull/127) -- [server] Refactor json-rpc protocol and `DefaultGLSPServerImplementation`. This includes changes of method names and parameters [#421](https://github.com/eclipse-glsp/glsp-server/pull/133) +- [diagram] Merged the `ServerLayoutConfiguration` API into the `DiagramConfiguration` API. The standalone `ServerLayoutConfiguration` is now deprecated and no longer supported [#95](https://github.com/eclipse-glsp/glsp-server/pull/95) +- [model] Renamed `ModelFactory` to `ModelSourceLoader` and adapted interface method. This also affects implementing classes like the `JsonFileModelFactory` [#96](https://github.com/eclipse-glsp/glsp-server/pull/96) +- [model] Reworked `ModelSubmissionHandler` API. This includes changes of method names and parameters [#101](https://github.com/eclipse-glsp/glsp-server/pull/96) [#197](https://github.com/eclipse-glsp/glsp-server/pull/101) +- [build] Update dependencies of Google Guava (>= 30.1) and Google Guice (>= 5.0.0). [#119](https://github.com/eclipse-glsp/glsp-server/pull/119) +- [build] The `org.apache.log4j` dependency is not reexported any more when consumed as p2 artifact. You need to import `org.apache.log4j` in your own plugins if you use the log4j API there. [#43](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/43) +- [protocol] Refactor the base communication protocol to support initializing and disposing a client session. Remove now obsolete `InitializeClientSessionAction` and `DisposeClientSessionAction`. [#123](https://github.com/eclipse-glsp/glsp-server/pull/123) +- [di] Complete rework of DI architecture. Your main module now has to extend `DiagramModule` instead of `GLSPModule`. Includes restructurings,cleanups and refactorings that affect most of the API components. [#127](https://github.com/eclipse-glsp/glsp-server/pull/127) +- [server] Refactor json-rpc protocol and `DefaultGLSPServerImplementation`. This includes changes of method names and parameters [#133](https://github.com/eclipse-glsp/glsp-server/pull/133) ## [v0.8.0 - 20/10/2020](https://github.com/eclipse-glsp/glsp/releases/tag/0.8.0) diff --git a/SECURITY.md b/SECURITY.md index 5f83d1cc..99bbbd8a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,17 +1,11 @@ -# Security Policy +# Eclipse GLSP Vulnerability Reporting Policy -Eclipse GLSP follows the [Eclipse Vulnerability Reporting Policy](https://www.eclipse.org/security/policy.php). -Vulnerabilities are tracked by the Eclipse security team, in cooperation with the GLSP project leads. -Fixing vulnerabilities is taken care of by the GLSP project committers, with assistance and guidance of the security team. +If you think or suspect that you have discovered a new security vulnerability +in this project, please __do not__ disclose it on GitHub, e.g. in an issue, a +PR, or a discussion. Any such disclosure will be removed/deleted on sight, to +promote orderly disclosure, as per the Eclipse Foundation Security Policy (1). -## Supported Versions -Eclipse GLSP is still in the incubation phase. -During this phase only the most current release is supported with security updates. +Instead, please report any potential vulnerability to the Eclipse Foundation [Security Team](https://www.eclipse.org/security/). Make sure to provide a concise description of the issue, a CWE, and other supporting information. -| Version | Supported | -| ------- | ------------------ | -| 0.9.0 | :white_check_mark: | -| < 0.9.0 | :x:| - -## Reporting a Vulnerability -We recommend that in case of suspected vulnerabilities you do not use the GLSP public issue tracker, but instead contact the Eclipse Security Team directly via security@eclipse.org. +(1) _Eclipse Foundation Vulnerability Reporting Policy_: +[https://www.eclipse.org/security/policy.php](https://www.eclipse.org/security/policy.php) 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 bb1764be..b85f0eee 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: 0.10.0.qualifier +Bundle-Version: 1.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-11 -Require-Bundle: org.eclipse.glsp.layout;bundle-version="[0.10.0,1.0.0)", - org.eclipse.glsp.server;bundle-version="[0.10.0,1.0.0)", - org.eclipse.glsp.server.websocket;bundle-version="[0.10.0,1.0.0)", +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)", org.eclipse.elk.core;bundle-version="0.6.0", org.eclipse.elk.alg.layered;bundle-version="0.6.0", org.eclipse.elk.graph;bundle-version="0.6.0" diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml index ae2b7853..cc684651 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -51,17 +51,17 @@ org.eclipse.glsp org.eclipse.glsp.server - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.glsp org.eclipse.glsp.server.websocket - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.glsp org.eclipse.glsp.layout - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.elk diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF index 5bab9e60..6d2a8d57 100644 --- a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Graph Bundle-SymbolicName: org.eclipse.glsp.graph;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 1.0.0 Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.graph Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.common;bundle-version="2.15.0", - com.google.gson, + com.google.gson;bundle-version="2.8.9", org.eclipse.emf.ecore;bundle-version="2.15.0";visibility:=reexport, com.google.guava;bundle-version="30.1.0";visibility:=reexport Export-Package: org.eclipse.glsp.graph, diff --git a/plugins/org.eclipse.glsp.graph/pom.xml b/plugins/org.eclipse.glsp.graph/pom.xml index bd5c543e..1f0d8c5f 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -60,7 +60,7 @@ com.google.code.gson gson - 2.8.2 + 2.8.9 diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF index bc77c802..aaf5cfa9 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: 0.10.0.qualifier +Bundle-Version: 1.0.0 Bundle-Vendor: EclispeSource Automatic-Module-Name: org.eclipse.glsp.layout Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.glsp.server;bundle-version="[0.10.0,1.0.0)", +Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.elk.core;bundle-version="0.7.1", org.eclipse.elk.graph;bundle-version="0.7.1", com.google.guava;bundle-version="30.1.0" diff --git a/plugins/org.eclipse.glsp.layout/pom.xml b/plugins/org.eclipse.glsp.layout/pom.xml index 51aa812e..04d37f4e 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -45,7 +45,7 @@ org.eclipse.glsp org.eclipse.glsp.server - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.elk 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 6e0363c9..7011d665 100644 --- a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server EMF Bundle-SymbolicName: org.eclipse.glsp.server.emf;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 1.0.0 Bundle-ClassPath: . Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.glsp.example.emf Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.glsp.server;bundle-version="0.10.0", +Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.glsp.graph;bundle-version="0.10.0", org.eclipse.emf.ecore;bundle-version="2.23.0", org.eclipse.emf.ecore.edit;bundle-version="2.13.0", diff --git a/plugins/org.eclipse.glsp.server.emf/pom.xml b/plugins/org.eclipse.glsp.server.emf/pom.xml index d5820ebd..13ff9772 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -46,12 +46,12 @@ org.eclipse.glsp org.eclipse.glsp.server - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.glsp org.eclipse.glsp.graph - 0.10.0-SNAPSHOT + 1.0.0 com.google.inject 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 ae9ee2ca..bb430b9c 100644 --- a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server Websocket Bundle-SymbolicName: org.eclipse.glsp.server.websocket -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 1.0.0 Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: com.eclipsesource.glps.server.websocket Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -12,11 +12,11 @@ Require-Bundle: javax.websocket;bundle-version="1.0.0";visibility:=reexport, org.eclipse.jetty.util;bundle-version="9.4.0";visibility:=reexport, org.eclipse.jetty.websocket.javax.websocket;bundle-version="9.4.0";visibility:=reexport, org.eclipse.jetty.websocket.javax.websocket.server;bundle-version="9.4.0";visibility:=reexport, - org.eclipse.glsp.server;bundle-version="[0.10.0,1.0.0)", + org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.lsp4j.websocket;bundle-version="0.9.0", org.eclipse.jetty.webapp;bundle-version="9.4.0";visibility:=reexport, org.eclipse.jetty.websocket.api;bundle-version="9.4.0";visibility:=reexport, - com.google.gson, + com.google.gson;bundle-version="2.8.9", org.eclipse.lsp4j, org.eclipse.lsp4j.jsonrpc Export-Package: org.eclipse.glsp.server.websocket diff --git a/plugins/org.eclipse.glsp.server.websocket/pom.xml b/plugins/org.eclipse.glsp.server.websocket/pom.xml index bec57aa4..157833f6 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -45,7 +45,7 @@ org.eclipse.glsp org.eclipse.glsp.server - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.jetty.websocket diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF index f028bd51..742a002a 100644 --- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server Bundle-SymbolicName: org.eclipse.glsp.server -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 1.0.0 Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.server Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.13.0", - com.google.gson;bundle-version="2.8.2", + com.google.gson;bundle-version="2.8.9", org.eclipse.lsp4j;bundle-version="0.9.0", org.eclipse.lsp4j.jsonrpc, org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport, com.google.inject;bundle-version="5.0.1";visibility:=reexport, javax.websocket;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.glsp.graph;bundle-version="[0.10.0,1.0.0)";visibility:=reexport, + org.eclipse.glsp.graph;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, javax.inject;bundle-version="1.0.0" Export-Package: org.eclipse.glsp.server.actions, org.eclipse.glsp.server.di, diff --git a/plugins/org.eclipse.glsp.server/pom.xml b/plugins/org.eclipse.glsp.server/pom.xml index 7f37ccd0..ffe1d10e 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -65,7 +65,7 @@ org.eclipse.glsp org.eclipse.glsp.graph - 0.10.0-SNAPSHOT + 1.0.0 org.eclipse.lsp4j diff --git a/pom.xml b/pom.xml index e514f37a..28af3723 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.eclipse.glsp org.eclipse.glsp.parent GLSP Parent pom - 0.10.0-SNAPSHOT + 1.0.0 pom GLSP Parent diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml index 2e4e8d8d..40a8f91e 100644 --- a/releng/org.eclipse.glsp.feature/feature.xml +++ b/releng/org.eclipse.glsp.feature/feature.xml @@ -2,7 +2,7 @@ @@ -319,7 +319,7 @@ 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 75f28df9..40025fbc 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 - 0.10.0-SNAPSHOT + 1.0.0 ../ eclipse-feature diff --git a/releng/org.eclipse.glsp.repository/pom.xml b/releng/org.eclipse.glsp.repository/pom.xml index 5fa65c06..6078231d 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 - 0.10.0-SNAPSHOT + 1.0.0 ../ org.eclipse.glsp.repository diff --git a/releng/pom.xml b/releng/pom.xml index c66baae4..e849395a 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -12,7 +12,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 0.10.0-SNAPSHOT + 1.0.0 ../pom.xml diff --git a/targetplatforms/r2022-03.tpd b/targetplatforms/r2022-03.tpd index 7ad04653..8f63402f 100644 --- a/targetplatforms/r2022-03.tpd +++ b/targetplatforms/r2022-03.tpd @@ -10,7 +10,7 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202203021722 org.apache.logging.log4j [2.17.1,3.0.0) org.apache.commons.cli [1.4.0,2.0.0) javax.servlet [3.1.0,4.0.0) - com.google.gson [2.8.2,3.0.0) + com.google.gson [2.8.9,3.0.0) com.google.inject [5.0.1,5.0.2) com.google.guava [30.1.0,31.0.0) org.junit [4.12.0,4.13.0) diff --git a/tests/org.eclipse.glsp.graph.test/pom.xml b/tests/org.eclipse.glsp.graph.test/pom.xml index 2d87d56b..6b26d49c 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -23,7 +23,7 @@ org.eclipse.glsp org.eclipse.glsp.graph - 0.10.0-SNAPSHOT + 1.0.0 org.junit.jupiter diff --git a/tests/org.eclipse.glsp.server.test/pom.xml b/tests/org.eclipse.glsp.server.test/pom.xml index 42ca8b21..ff9c8e9c 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 - 0.10.0-SNAPSHOT + 1.0.0 ../../pom.xml @@ -23,7 +23,7 @@ org.eclipse.glsp org.eclipse.glsp.server - 0.10.0-SNAPSHOT + 1.0.0 org.junit.jupiter diff --git a/tests/pom.xml b/tests/pom.xml index e5b84e45..e23e6b4a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -12,7 +12,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 0.10.0-SNAPSHOT + 1.0.0 ../pom.xml