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 56f7a67d..4838dded 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: 2.5.0.SNAPSHOT +Bundle-Version: 2.5.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml index 657e731c..77326cb5 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../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 341df908..96a902b2 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: 2.5.0.SNAPSHOT +Bundle-Version: 2.5.0.qualifier 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 5909f888..d53da61b 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../pom.xml diff --git a/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GraphGsonConfigurator.java b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GraphGsonConfigurator.java index c675ead1..a702808c 100644 --- a/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GraphGsonConfigurator.java +++ b/plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GraphGsonConfigurator.java @@ -21,6 +21,8 @@ import java.util.List; import java.util.Map; +import org.eclipse.emf.common.util.BasicEList; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EObject; @@ -29,6 +31,7 @@ import org.eclipse.glsp.graph.GraphPackage; import com.google.gson.GsonBuilder; +import com.google.gson.InstanceCreator; public class GraphGsonConfigurator { @@ -58,6 +61,7 @@ public GraphGsonConfigurator withEPackages(final EPackage... packages) { public GsonBuilder configureGsonBuilder(final GsonBuilder gsonBuilder) { gsonBuilder.registerTypeAdapterFactory(new EMapTypeAdapter.Factory()); gsonBuilder.registerTypeAdapterFactory(new GModelElementTypeAdapter.Factory(DEFAULT_TYPE_ATT, typeMap)); + gsonBuilder.registerTypeAdapter(EList.class, (InstanceCreator>) type -> new BasicEList<>()); configureClassesOfPackages(gsonBuilder); gsonBuilder.addSerializationExclusionStrategy(new EObjectExclusionStrategy()); return gsonBuilder; diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF index b3ff4a6e..203bb810 100644 --- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Layout Bundle-SymbolicName: org.eclipse.glsp.layout -Bundle-Version: 2.5.0.SNAPSHOT +Bundle-Version: 2.5.0.qualifier Bundle-Vendor: EclispeSource Automatic-Module-Name: org.eclipse.glsp.layout Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.glsp.layout/pom.xml b/plugins/org.eclipse.glsp.layout/pom.xml index 7bb9cbaa..5f75db21 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../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 e082fe54..ed58de2f 100644 --- a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server EMF Bundle-SymbolicName: org.eclipse.glsp.server.emf;singleton:=true -Bundle-Version: 2.5.0.SNAPSHOT +Bundle-Version: 2.5.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin diff --git a/plugins/org.eclipse.glsp.server.emf/pom.xml b/plugins/org.eclipse.glsp.server.emf/pom.xml index 010f0085..d6c5b529 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../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 40d897d9..7f72df99 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: 2.5.0.SNAPSHOT +Bundle-Version: 2.5.0.qualifier Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: com.eclipsesource.glps.server.websocket Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.glsp.server.websocket/pom.xml b/plugins/org.eclipse.glsp.server.websocket/pom.xml index 37d4bb51..6f3ea8e5 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../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 ed09063a..8b0c48c7 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: 2.5.0.SNAPSHOT +Bundle-Version: 2.5.0.qualifier Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.server Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.glsp.server/pom.xml b/plugins/org.eclipse.glsp.server/pom.xml index 3335d809..5a779dee 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 196eaf80..0c0a7a24 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.eclipse.glsp org.eclipse.glsp.parent GLSP Parent pom - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT pom GLSP Parent diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml index ad284950..0ef77995 100644 --- a/releng/org.eclipse.glsp.feature/feature.xml +++ b/releng/org.eclipse.glsp.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/org.eclipse.glsp.feature/pom.xml b/releng/org.eclipse.glsp.feature/pom.xml index e3c54d02..2cdfe5f7 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../ eclipse-feature diff --git a/releng/org.eclipse.glsp.repository/pom.xml b/releng/org.eclipse.glsp.repository/pom.xml index 88991fb6..b5b04a5d 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../ org.eclipse.glsp.repository diff --git a/releng/pom.xml b/releng/pom.xml index c656843f..6c307705 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -12,7 +12,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../pom.xml diff --git a/tests/org.eclipse.glsp.graph.test/pom.xml b/tests/org.eclipse.glsp.graph.test/pom.xml index ac7d411b..0713dc8e 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../pom.xml diff --git a/tests/org.eclipse.glsp.server.test/pom.xml b/tests/org.eclipse.glsp.server.test/pom.xml index 088b40e3..3a67d02f 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 - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../../pom.xml diff --git a/tests/pom.xml b/tests/pom.xml index bba8fabd..f1c8aacc 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -12,7 +12,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 2.5.0.SNAPSHOT + 2.5.0-SNAPSHOT ../pom.xml