Skip to content

GLSP-1509: Fix maven build #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tortmayr merged 1 commit into from
Apr 18, 2025
Merged

GLSP-1509: Fix maven build #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
View file
Open in desktop
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 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
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.glsp.example.workflow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
View file
Open in desktop
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 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.graph/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 4 additions & 0 deletions plugins/org.eclipse.glsp.graph/src/org/eclipse/glsp/graph/gson/GraphGsonConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -29,6 +31,7 @@
import org.eclipse.glsp.graph.GraphPackage;

import com.google.gson.GsonBuilder;
import com.google.gson.InstanceCreator;

public class GraphGsonConfigurator {

Expand Down Expand Up @@ -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<EList<?>>) type -> new BasicEList<>());
configureClassesOfPackages(gsonBuilder);
gsonBuilder.addSerializationExclusionStrategy(new EObjectExclusionStrategy());
return gsonBuilder;
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
View file
Open in desktop
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 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.layout/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
View file
Open in desktop
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 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server.emf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
View file
Open in desktop
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 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server.websocket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
View file
Open in desktop
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 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<description>GLSP Parent pom </description>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>GLSP Parent</name>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.glsp.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.glsp.feature"
label="GLSP SDK (Core)"
version="2.5.0.SNAPSHOT"
version="2.5.0.qualifier"
provider-name="Eclipse GLSP">

<description url="http://www.example.com/description">
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.glsp.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.releng</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<packaging>eclipse-feature</packaging>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.glsp.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.releng</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>org.eclipse.glsp.repository</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.glsp.graph.test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/org.eclipse.glsp.server.test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<version>2.5.0.SNAPSHOT</version>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading