Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 backend/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.syson</groupId>
<artifactId>syson-application-parent</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>

<name>syson-application-parent</name>
<description>SysON Application Parent</description>
Expand Down
12 changes: 6 additions & 6 deletions backend/application/syson-application-configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-application-configuration</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-application-configuration</name>
<description>SysON Application Configuration</description>

Expand Down Expand Up @@ -69,27 +69,27 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel-edit</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-services</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-siriusweb-customnodes-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-siriusweb-customnodes-metamodel-edit</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
30 changes: 15 additions & 15 deletions backend/application/syson-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-application</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-application</name>
<description>SysON Application</description>

Expand Down Expand Up @@ -82,72 +82,72 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel-edit</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-frontend</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-application-configuration</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-rest-api-services</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-diagram-common-view</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-diagram-general-view</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-diagram-interconnection-view</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-diagram-actionflow-view</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-diagram-statetransition-view</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-tree-explorer-view</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-import</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-export</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-validation</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>

<!-- Test Dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion backend/application/syson-frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-frontend</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-frontend</name>
<description>SysON Frontend</description>

Expand Down
6 changes: 3 additions & 3 deletions backend/application/syson-sysml-export/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-export</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-sysml-export</name>
<description>SysON SysML Export</description>

Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -85,7 +85,7 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions backend/application/syson-sysml-import/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-import</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-sysml-import</name>
<description>SysON SysML Import</description>

Expand Down Expand Up @@ -65,12 +65,12 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-services</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -86,7 +86,7 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-application-configuration</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,13 @@ private List<EObject> parseJsonArray(final JsonNode astJson) {

private List<EObject> parseJsonObject(final JsonNode astJson) {
final List<EObject> result = new ArrayList<>();

final EObject eObject = this.typeBuilder.createObject(astJson);
if (eObject != null) {

this.fillElementWith(astJson, eObject);

result.add(eObject);
} else {
this.messageReporter.error("Error building the object " + astJson);
}

return result;
}

Expand Down Expand Up @@ -135,7 +131,7 @@ private void fillElementWith(final JsonNode astJson, final EObject eObject) {
}

} else {
LOGGER.trace("Ingoring field " + key);
LOGGER.trace("Ignoring field " + key);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ public boolean isContainmentReference(final EObject eObject, String referenceNam

public EObject handleContainmentReference(final EObject eObject, String referenceName, final JsonNode astValue) {
final EObject newObject;
final EObject refrenceTypeInstance = this.typeBuilder.createObject(astValue);
final EObject referenceTypeInstance = this.typeBuilder.createObject(astValue);

if (refrenceTypeInstance != null) {
newObject = this.addChild(eObject, referenceName, astValue, refrenceTypeInstance);
if (referenceTypeInstance != null) {
newObject = this.addChild(eObject, referenceName, astValue, referenceTypeInstance);
} else {
String msg = MessageFormat.format("Unexpected child type in {0} with reference {1} for holding {2}", this.logNameProvider.getName(eObject), referenceName, astValue);
this.messageReporter.error(msg);
Expand Down
8 changes: 4 additions & 4 deletions backend/application/syson-sysml-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-validation</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-validation</name>
<description>SysON SysMLv2 validation rules for Validation view</description>

Expand Down Expand Up @@ -69,17 +69,17 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel-edit</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-services</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion backend/metamodel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.syson</groupId>
<artifactId>syson-metamodel-parent</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>

<name>syson-metamodel-parent</name>
<description>SysON Metamodel Parent</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-siriusweb-customnodes-metamodel-edit</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-siriusweb-customnodes-metamodel-edit</name>
<description>SysON SysMLv2 Custom Nodes Metamodel - Edit Support</description>

Expand Down Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-siriusweb-customnodes-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-siriusweb-customnodes-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-siriusweb-customnodes-metamodel</name>
<description>SysON SysMLv2 Custom Nodes Metamodel for Sirius Web</description>

Expand Down
4 changes: 2 additions & 2 deletions backend/metamodel/syson-sysml-metamodel-edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel-edit</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-sysml-metamodel-edit</name>
<description>SysON SysMLv2 Metamodel - Edit Support</description>

Expand Down Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion backend/metamodel/syson-sysml-metamodel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</parent>
<groupId>org.eclipse.syson</groupId>
<artifactId>syson-sysml-metamodel</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>
<name>syson-sysml-metamodel</name>
<description>SysON SysMLv2 Metamodel</description>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2040,7 +2040,7 @@ private String getDeresolvableName(Element toDeresolve, Element context) {
} else {
String deresolvedName = this.nameDeresolver.getDeresolvedName(toDeresolve, context);
if (deresolvedName == null || deresolvedName.isBlank()) {
this.reportConsumer.accept(Status.warning("Empty deresolved name for {0} with id {1}", toDeresolve.eClass(), toDeresolve.getElementId()));
this.reportConsumer.accept(Status.warning("Empty deresolved name for {0} with id {1}", toDeresolve.eClass().getName(), toDeresolve.getElementId()));
}
result = deresolvedName;
}
Expand Down
2 changes: 1 addition & 1 deletion backend/releng/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>org.eclipse.syson</groupId>
<artifactId>syson-releng-parent</artifactId>
<version>2025.4.7</version>
<version>2025.4.8</version>

<name>syson-releng-parent</name>
<description>SysON Releng Parent</description>
Expand Down
Loading
Loading