[releng] Switch to Sirius Web 2025.10.1

AxelRICHARD · AxelRICHARD · commit ffb61b9f15e0 · 2025-10-27T15:22:46.000+01:00
Signed-off-by: Axel RICHARD &lt;axel.richard@obeo.fr&gt;
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -11,6 +11,10 @@
 === Dependency update
 
 - [releng] Update to ANTLR 4.13.2 to match the version sirius-web is using
+- [releng] Update to https://github.com/eclipse-sirius/sirius-web[Sirius Web 2025.10.1]
+- [releng] Switch to https://github.com/spring-projects/spring-boot/releases/tag/v3.5.7[Spring Boot 3.5.7]
+- [releng] Remove the dependency to xstate
+- [releng] Switch to AQL 8.1.0 from https://download.eclipse.org/acceleo/updates/releases/4.2/R202510230846/[Acceleo 4.2.0]
 
 === Bug fixes
 
diff --git a/backend/application/syson-application-configuration/pom.xml b/backend/application/syson-application-configuration/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/application/syson-application/pom.xml b/backend/application/syson-application/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVSubNodeActionFlowCreationTests.java b/backend/application/syson-application/src/test/java/org/eclipse/syson/application/controllers/diagrams/general/view/GVSubNodeActionFlowCreationTests.java
@@ -245,7 +245,7 @@ public void setUp() {
     public void tearDown() {
         if (this.verifier != null) {
             this.verifier.thenCancel()
-                    .verify(Duration.ofSeconds(1000));
+                    .verify(Duration.ofSeconds(10));
         }
     }
 
diff --git a/backend/application/syson-sysml-export/pom.xml b/backend/application/syson-sysml-export/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/application/syson-sysml-import/pom.xml b/backend/application/syson-sysml-import/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/application/syson-sysml-validation/pom.xml b/backend/application/syson-sysml-validation/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/application/syson-sysml-validation/src/main/java/org/eclipse/syson/sysml/validation/SysMLv2ValidationRules.java b/backend/application/syson-sysml-validation/src/main/java/org/eclipse/syson/sysml/validation/SysMLv2ValidationRules.java
diff --git a/backend/metamodel/syson-siriusweb-customnodes-metamodel-edit/pom.xml b/backend/metamodel/syson-siriusweb-customnodes-metamodel-edit/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/metamodel/syson-siriusweb-customnodes-metamodel/pom.xml b/backend/metamodel/syson-siriusweb-customnodes-metamodel/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/services/syson-direct-edit-grammar/pom.xml b/backend/services/syson-direct-edit-grammar/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 		<antlr.version>4.13.2</antlr.version>
 	</properties>
 
diff --git a/backend/services/syson-services/pom.xml b/backend/services/syson-services/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 		<antlr.version>4.10.1</antlr.version>
 	</properties>
 
diff --git a/backend/services/syson-services/src/main/java/org/eclipse/syson/services/DeleteService.java b/backend/services/syson-services/src/main/java/org/eclipse/syson/services/DeleteService.java
@@ -18,8 +18,8 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.sirius.components.emf.services.EditingContextCrossReferenceAdapter;
 import org.eclipse.syson.sysml.Dependency;
 import org.eclipse.syson.sysml.Element;
 import org.eclipse.syson.sysml.Membership;
@@ -56,9 +56,8 @@ public EObject deleteFromModel(Element element) {
     }
 
     private void collectRelatedElements(EObject eObject, Set<EObject> relatedElements) {
-        var optAdapter = eObject.eAdapters().stream().filter(EditingContextCrossReferenceAdapter.class::isInstance).map(EditingContextCrossReferenceAdapter.class::cast).findFirst();
-        if (optAdapter.isPresent()) {
-            EditingContextCrossReferenceAdapter referenceAdapter = optAdapter.get();
+        var referenceAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(eObject);
+        if (referenceAdapter != null) {
             Collection<Setting> inverseReferences = referenceAdapter.getInverseReferences(eObject);
             for (Setting setting : inverseReferences) {
                 EObject relatedElement = setting.getEObject();
diff --git a/backend/services/syson-services/src/main/java/org/eclipse/syson/services/UtilService.java b/backend/services/syson-services/src/main/java/org/eclipse/syson/services/UtilService.java
@@ -25,10 +25,10 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
 import org.eclipse.sirius.components.core.api.IEditingContext;
-import org.eclipse.sirius.components.emf.services.EditingContextCrossReferenceAdapter;
 import org.eclipse.sirius.components.emf.services.api.IEMFEditingContext;
 import org.eclipse.syson.services.api.ViewDefinitionKind;
 import org.eclipse.syson.sysml.AcceptActionUsage;
@@ -392,10 +392,11 @@ public List<Element> collectSuccessionSourceAndTarget(Type type) {
      */
     public List<EObject> getEInverseRelatedElements(EObject eObject, EStructuralFeature eStructuralFeature) {
         List<EObject> result = new ArrayList<>();
-        var optAdapter = eObject.eAdapters().stream().filter(EditingContextCrossReferenceAdapter.class::isInstance).map(EditingContextCrossReferenceAdapter.class::cast).findFirst();
-        if (optAdapter.isPresent()) {
-            EditingContextCrossReferenceAdapter referenceAdapter = optAdapter.get();
-            referenceAdapter.getInverseReferences(eObject).stream().filter(set -> set.getEStructuralFeature().equals(eStructuralFeature)).forEach(set -> result.add(set.getEObject()));
+        var referenceAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(eObject);
+        if (referenceAdapter != null) {
+            referenceAdapter.getInverseReferences(eObject).stream()
+                    .filter(set -> set.getEStructuralFeature().equals(eStructuralFeature))
+                    .forEach(set -> result.add(set.getEObject()));
         }
         return result;
     }
diff --git a/backend/services/syson-services/src/test/java/org/eclipse/syson/services/ElementInitializerSwitchTest.java b/backend/services/syson-services/src/test/java/org/eclipse/syson/services/ElementInitializerSwitchTest.java
@@ -19,7 +19,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.sirius.components.emf.services.EditingContextCrossReferenceAdapter;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.sirius.emfjson.resource.JsonResourceFactoryImpl;
 import org.eclipse.syson.sysml.Element;
 import org.eclipse.syson.sysml.Membership;
@@ -54,10 +54,8 @@ public class ElementInitializerSwitchTest {
     @BeforeEach
     public void setUp() {
         this.rSet = new ResourceSetImpl();
-        // Make sure the resources we manipulate use the Sirius Web CrossReferenceAdapter.
-        // This is particularly important when manipulating memberships, where the cross-referencer may produce
-        // unexpected behaviors that cannot be observed in a resource without it.
-        this.rSet.eAdapters().add(new EditingContextCrossReferenceAdapter());
+        // Make sure the resources we manipulate use a CrossReferenceAdapter.
+        this.rSet.eAdapters().add(new ECrossReferenceAdapter());
         this.resource = new JsonResourceFactoryImpl().createResource(URI.createURI("ElementInitializerSwitchTest"));
         this.rSet.getResources().add(this.resource);
         this.elementInitializerSwitch = new ElementInitializerSwitch();
diff --git a/backend/services/syson-services/src/test/java/org/eclipse/syson/services/SysMLMoveElementServiceTest.java b/backend/services/syson-services/src/test/java/org/eclipse/syson/services/SysMLMoveElementServiceTest.java
@@ -23,7 +23,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.sirius.components.emf.services.EditingContextCrossReferenceAdapter;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.sirius.emfjson.resource.JsonResourceFactoryImpl;
 import org.eclipse.syson.sysml.Element;
 import org.eclipse.syson.sysml.FeatureMembership;
@@ -58,10 +58,8 @@ public void setUp() {
         this.readOnlyElements = new ArrayList<>();
         this.moveService = new SysMLMoveElementService(e -> this.readOnlyElements.contains(e));
         this.rSet = new ResourceSetImpl();
-        // Make sure the resources we manipulate use the Sirius Web CrossReferenceAdapter.
-        // This is particularly important when manipulating memberships, where the cross-referencer may produce
-        // unexpected behaviors that cannot be observed in a resource without it.
-        this.rSet.eAdapters().add(new EditingContextCrossReferenceAdapter());
+        // Make sure the resources we manipulate use a CrossReferenceAdapter.
+        this.rSet.eAdapters().add(new ECrossReferenceAdapter());
         this.resource = new JsonResourceFactoryImpl().createResource(URI.createURI("UtilServiceTest"));
         this.rSet.getResources().add(this.resource);
     }
diff --git a/backend/services/syson-sysml-rest-api-services/pom.xml b/backend/services/syson-sysml-rest-api-services/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/services/syson-sysml-rest-api-services/src/main/java/org/eclipse/syson/sysml/rest/api/SysONObjectRestService.java b/backend/services/syson-sysml-rest-api-services/src/main/java/org/eclipse/syson/sysml/rest/api/SysONObjectRestService.java
@@ -23,8 +23,8 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.sirius.components.core.api.IEditingContext;
-import org.eclipse.sirius.components.emf.services.EditingContextCrossReferenceAdapter;
 import org.eclipse.sirius.components.emf.services.api.IEMFEditingContext;
 import org.eclipse.sirius.web.application.object.dto.Direction;
 import org.eclipse.sirius.web.application.object.services.api.IDefaultObjectRestService;
@@ -120,12 +120,8 @@ public List<Object> getRootElements(IEditingContext editingContext) {
 
     private Set<Object> getIngoingRelationships(Element elt) {
         Set<Object> ingoingRelationships = new HashSet<>();
-        var optAdapter = elt.eAdapters().stream()
-                .filter(EditingContextCrossReferenceAdapter.class::isInstance)
-                .map(EditingContextCrossReferenceAdapter.class::cast)
-                .findFirst();
-        if (optAdapter.isPresent()) {
-            EditingContextCrossReferenceAdapter referenceAdapter = optAdapter.get();
+        var referenceAdapter = ECrossReferenceAdapter.getCrossReferenceAdapter(elt);
+        if (referenceAdapter != null) {
             Collection<Setting> inverseReferences = referenceAdapter.getInverseReferences(elt);
             for (Setting setting : inverseReferences) {
                 EObject relatedElement = setting.getEObject();
diff --git a/backend/views/syson-common-view/pom.xml b/backend/views/syson-common-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-diagram-common-view/pom.xml b/backend/views/syson-diagram-common-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-diagram-tests/pom.xml b/backend/views/syson-diagram-tests/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-standard-diagrams-view/pom.xml b/backend/views/syson-standard-diagrams-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-table-requirements-view/pom.xml b/backend/views/syson-table-requirements-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-tree-explorer-view/pom.xml b/backend/views/syson-tree-explorer-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.10.0</sirius.web.version>
+		<sirius.web.version>2025.10.1</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/frontend/syson-components/package.json b/frontend/syson-components/package.json
diff --git a/frontend/syson/package.json b/frontend/syson/package.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/scripts/check-coverage.jsh b/scripts/check-coverage.jsh

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ public void setUp() {`
`245`	`245`	`public void tearDown() {`
`246`	`246`	`if (this.verifier != null) {`
`247`	`247`	`this.verifier.thenCancel()`
`248`		`- .verify(Duration.ofSeconds(1000));`
	`248`	`+ .verify(Duration.ofSeconds(10));`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`