[releng] Switch to Sirius Web 2025.1.2

AxelRICHARD · AxelRICHARD · commit 3e69e8b2e6a2 · 2025-01-21T12:04:06.000+01:00
Signed-off-by: Axel RICHARD &lt;axel.richard@obeo.fr&gt;
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -8,6 +8,7 @@
 
 === Dependency update
 
+- Switch to Sirius Web 2025.1.2
 - https://github.com/eclipse-syson/syson/issues/953[#953] [rest-apis] Backend module `syson-sysml-rest-api-services` now depends on `jackson-datatype-jsr310` for JSON dates serialization
 
 === 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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLEditingContextProcessor.java b/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLEditingContextProcessor.java
@@ -58,7 +58,7 @@ public SysMLEditingContextProcessor(SysMLStandardLibrariesConfiguration standard
     @Override
     public void preProcess(IEditingContext editingContext) {
         if (editingContext instanceof IEMFEditingContext siriusWebEditingContext
-                && !this.studioCapableEditingContextPredicate.test(editingContext)) {
+                && !this.studioCapableEditingContextPredicate.test(editingContext.getId())) {
             // Do not initialize the editing context as a SysON editing context if it contains a studio.
             siriusWebEditingContext.getDomain().getResourceSet().eAdapters().add(new SysONEContentAdapter());
 
diff --git a/backend/application/syson-application/pom.xml b/backend/application/syson-application/pom.xml
@@ -30,7 +30,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<eef.version>2.1.5-SNAPSHOT</eef.version>
-		<sirius.web.version>2025.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 	
 	<repositories>
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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 	
 	<repositories>
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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 		<antlr.version>4.10.1</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 		<antlr.version>4.10.1</antlr.version>
 	</properties>
 
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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 	
 	<repositories>
diff --git a/backend/views/syson-diagram-actionflow-view/pom.xml b/backend/views/syson-diagram-actionflow-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java b/backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewCreateService.java
@@ -238,11 +238,11 @@ public Element createCompartmentItemWithDirection(Element element, String eRefer
                 var membership = this.createAppropriateMembership(structuralFeature);
                 element.getOwnedRelationship().add(membership);
                 membership.getOwnedRelatedElement().add(result);
+                result = this.elementInitializer(elementItem);
                 if (directionLiteral != null && item instanceof Feature feature) {
                     feature.setDirection(FeatureDirectionKind.get(directionLiteral));
                     result.setDeclaredName(result.getName() + StringUtils.capitalize(directionLiteral));
                 }
-                result = this.elementInitializer(elementItem);
             }
         }
         return result;
diff --git a/backend/views/syson-diagram-general-view/pom.xml b/backend/views/syson-diagram-general-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-diagram-interconnection-view/pom.xml b/backend/views/syson-diagram-interconnection-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-diagram-statetransition-view/pom.xml b/backend/views/syson-diagram-statetransition-view/pom.xml
@@ -29,7 +29,7 @@
 
 	<properties>
 		<java.version>17</java.version>
-		<sirius.web.version>2025.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</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.1.1</sirius.web.version>
+		<sirius.web.version>2025.1.2</sirius.web.version>
 	</properties>
 
 	<repositories>
diff --git a/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/SysONExplorerContributionProvider.java b/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/SysONExplorerContributionProvider.java
@@ -57,7 +57,7 @@ public List<TreeDescription> getDescriptions(IEditingContext editingContext) {
 
     private Optional<TreeDescription> getSysONExplorerTreeDescription(IEditingContext editingContext) {
         Optional<TreeDescription> result = Optional.empty();
-        if (!this.studioCapableEditingContextPredicate.test(editingContext)) {
+        if (!this.studioCapableEditingContextPredicate.test(editingContext.getId())) {
             // Do not use the custom SysON Explorer in studio project: they should be managed by the Sirius Web
             // explorer.
             result = this.representationDescriptionSearchService
diff --git a/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java b/backend/views/syson-tree-explorer-view/src/main/java/org/eclipse/syson/tree/explorer/view/services/SysONDefaultExplorerServices.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -21,7 +21,6 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.sirius.components.core.api.IEditingContext;
 import org.eclipse.sirius.components.core.api.IObjectService;
-import org.eclipse.sirius.web.application.UUIDParser;
 import org.eclipse.sirius.web.application.editingcontext.EditingContext;
 import org.eclipse.sirius.web.application.views.explorer.services.api.IExplorerServices;
 import org.eclipse.sirius.web.domain.boundedcontexts.representationdata.services.api.IRepresentationMetadataSearchService;
@@ -134,14 +133,8 @@ public boolean hasChildren(Object self, IEditingContext editingContext, List<Str
     }
 
     private boolean hasRepresentation(EObject self, IEditingContext editingContext) {
-        var optionalEditingContextId = new UUIDParser().parse(editingContext.getId());
-        if (optionalEditingContextId.isPresent()) {
-            var projectId = optionalEditingContextId.get();
-            String id = this.objectService.getId(self);
-            return this.representationMetadataSearchService.existAnyRepresentationForProjectAndTargetObjectId(AggregateReference.to(projectId), id);
-        }
-
-        return false;
+        String id = this.objectService.getId(self);
+        return this.representationMetadataSearchService.existAnyRepresentationForProjectAndTargetObjectId(AggregateReference.to(editingContext.getId()), id);
     }
 
     @Override
diff --git a/doc/content/modules/user-manual/assets/attachments/sirius-web-openapi.json b/doc/content/modules/user-manual/assets/attachments/sirius-web-openapi.json
diff --git a/doc/content/modules/user-manual/assets/images/release-notes-diagrams-export-as-png.png b/doc/content/modules/user-manual/assets/images/release-notes-diagrams-export-as-png.png
diff --git a/doc/content/modules/user-manual/pages/release-notes/2025.2.0.adoc b/doc/content/modules/user-manual/pages/release-notes/2025.2.0.adoc
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
