Skip to content

Commit 75b6856

Browse files
committed
[releng] Switch to Sirius Web 2026.3.1
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
1 parent 9cd4a60 commit 75b6856

44 files changed

Lines changed: 789 additions & 635 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ As a result, the following GraphQL mutations have been removed `exposeRequiremen
1717

1818
=== Dependency update
1919

20-
- As of version 2026.5.0, SysON now requires **Java 21** or later.
21-
- [releng] Switch to `jacoco-maven-plugin` 0.8.14.
22-
- [releng] Switch to `maven-checkstyle-plugin` 3.6.0 and CheckStyle 3.13.0.
20+
- [releng] As of version 2026.5.0, SysON now requires **Java 21** or later.
21+
- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2026.3.1]
22+
- [releng] Update to `jacoco-maven-plugin` 0.8.14.
23+
- [releng] Update to `maven-checkstyle-plugin` 3.6.0 and CheckStyle 3.13.0.
24+
- [releng] Update to lexical 0.42.0
2325

2426
=== Bug fixes
2527

@@ -28,6 +30,7 @@ As a result, the following GraphQL mutations have been removed `exposeRequiremen
2830

2931
=== Improvements
3032

33+
3134
=== New features
3235

3336
- https://github.com/eclipse-syson/syson/issues/1979[#1979] [diagrams] Add tools to create timeslices and snapshots, available on `OccurrenceUsage`, `ItemUsage`, and `PartUsage` graphical nodes.

backend/application/syson-application-configuration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/application/syson-application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/explorer/view/ExplorerViewControllerIntegrationTests.java

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import org.eclipse.emf.ecore.EObject;
3030
import org.eclipse.emf.ecore.resource.Resource;
31+
import org.eclipse.emf.ecore.resource.ResourceSet;
3132
import org.eclipse.sirius.components.collaborative.dto.CreateChildInput;
3233
import org.eclipse.sirius.components.collaborative.dto.CreateChildSuccessPayload;
3334
import org.eclipse.sirius.components.core.api.IEditingContextSearchService;
@@ -50,6 +51,10 @@
5051
import org.eclipse.syson.application.data.GeneralViewEmptyTestProjectData;
5152
import org.eclipse.syson.application.data.ProjectWithLibraryDependencyContainingLibraryPackageTestProjectData;
5253
import org.eclipse.syson.application.data.WithUserLibrariesTestProjectData;
54+
import org.eclipse.syson.sysml.Element;
55+
import org.eclipse.syson.sysml.LibraryPackage;
56+
import org.eclipse.syson.sysml.Namespace;
57+
import org.eclipse.syson.sysml.SysmlPackage;
5358
import org.eclipse.syson.tree.explorer.filters.SysONTreeFilterConstants;
5459
import org.eclipse.syson.tree.explorer.fragments.LibrariesDirectory;
5560
import org.eclipse.syson.tree.explorer.fragments.UserLibrariesDirectory;
@@ -405,14 +410,38 @@ private List<String> getAllTreeItemIds(String editingContextId) {
405410

406411
var editingContext = optionalEditingContext.get();
407412
var expandedIds = new ArrayList<String>();
408-
editingContext.getDomain().getResourceSet().getAllContents().forEachRemaining(notifier -> {
409-
if (notifier instanceof Resource || notifier instanceof EObject) {
410-
expandedIds.add(this.identityService.getId(notifier));
411-
}
412-
});
413+
ResourceSet resourceSet = editingContext.getDomain().getResourceSet();
414+
List<Resource> resources = resourceSet.getResources().stream().filter(r -> !this.isStandardLibrary(r)).toList();
415+
for (Resource resource : resources) {
416+
expandedIds.add(this.identityService.getId(resource));
417+
resource.getAllContents().forEachRemaining(notifier -> {
418+
if (notifier instanceof EObject) {
419+
expandedIds.add(this.identityService.getId(notifier));
420+
}
421+
});
422+
}
413423
return expandedIds;
414424
}
415425

426+
private boolean isStandardLibrary(Resource resource) {
427+
var standardLib = resource.getContents().stream()
428+
.filter(Namespace.class::isInstance)
429+
.map(Namespace.class::cast)
430+
.filter(this::isRootNamespace)
431+
.flatMap(namespace -> namespace.getOwnedElement().stream())
432+
.filter(LibraryPackage.class::isInstance)
433+
.map(LibraryPackage.class::cast)
434+
.filter(libraryPackage -> libraryPackage.isIsStandard())
435+
.findFirst();
436+
return standardLib.isPresent();
437+
}
438+
439+
private boolean isRootNamespace(Element element) {
440+
return element.eClass() == SysmlPackage.eINSTANCE.getNamespace()
441+
&& element.getOwner() == null
442+
&& element.getName() == null;
443+
}
444+
416445
private Consumer<Object> getTreeRefreshedEventPayloadMatcher(List<TreeItemMatcher> treeItemMatchers) {
417446
return assertRefreshedTreeThat(tree -> {
418447
assertThat(treeItemMatchers).allMatch(treeItemMatcher -> {

backend/application/syson-sysml-export/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/application/syson-sysml-import/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/application/syson-sysml-validation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/metamodel/syson-siriusweb-customnodes-metamodel-edit/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/metamodel/syson-siriusweb-customnodes-metamodel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

backend/services/syson-diagram-services/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<properties>
3131
<java.version>21</java.version>
32-
<sirius.web.version>2026.3.0</sirius.web.version>
32+
<sirius.web.version>2026.3.1</sirius.web.version>
3333
</properties>
3434

3535
<repositories>

0 commit comments

Comments
 (0)