[releng] Bump to 2025.12.2 and switch to SW 2025.12.2

lfasani · lfasani · commit 3eeeb1565fa6 · 2026-01-20T14:58:06.000+01:00
diff --git a/backend/ontology-application/pom.xml b/backend/ontology-application/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>ontology</groupId>
         <artifactId>ontology-parent</artifactId>
-        <version>2025.12.0</version>
+        <version>2025.12.2</version>
         <relativePath>../ontology-parent</relativePath>
     </parent>
     <artifactId>ontology-application</artifactId>
diff --git a/backend/ontology-application/src/test/java/fr/obeo/ontology/application/details/DetailsViewControllerIntegrationTests.java b/backend/ontology-application/src/test/java/fr/obeo/ontology/application/details/DetailsViewControllerIntegrationTests.java
@@ -22,6 +22,7 @@
 import java.util.UUID;
 import java.util.function.Predicate;
 
+import org.eclipse.sirius.components.collaborative.forms.dto.FormCapabilitiesRefreshedEventPayload;
 import org.eclipse.sirius.components.collaborative.forms.dto.FormRefreshedEventPayload;
 import org.eclipse.sirius.web.application.views.details.dto.DetailsEventInput;
 import org.eclipse.sirius.web.tests.graphql.DetailsEventSubscriptionRunner;
@@ -69,13 +70,16 @@ public void givenSemanticObjectWhenWeSubscribeToItsPropertiesEventsThenTheFormIs
         var input = new DetailsEventInput(UUID.randomUUID(), OntologyProjectIdentifiers.ONTOLOGY_PROJECT_EDITING_CONTEXT_ID, detailsRepresentationId);
         var flux = this.detailsEventSubscriptionRunner.run(input);
 
-        Predicate<Object> formContentMatcher = object -> {
-            return Optional.of(object)
-                    .filter(FormRefreshedEventPayload.class::isInstance)
-                    .isPresent();
-        };
+        Predicate<Object> formCapabilitiesMatcher = object -> Optional.of(object)
+                .filter(FormCapabilitiesRefreshedEventPayload.class::isInstance)
+                .isPresent();
+
+        Predicate<Object> formContentMatcher = object -> Optional.of(object)
+                .filter(FormRefreshedEventPayload.class::isInstance)
+                .isPresent();
 
         StepVerifier.create(flux)
+                .expectNextMatches(formCapabilitiesMatcher)
                 .expectNextMatches(formContentMatcher)
                 .thenCancel()
                 .verify(Duration.ofSeconds(10));
diff --git a/backend/ontology-application/src/test/resources/scripts/cleanup.sql b/backend/ontology-application/src/test/resources/scripts/cleanup.sql
@@ -8,6 +8,7 @@ DELETE FROM representation_metadata;
 DELETE FROM image;
 DELETE FROM nature;
 DELETE FROM project;
+DELETE FROM project_semantic_data;
 --DELETE FROM project_access_rule;
 --DELETE FROM membership;
 --DELETE FROM team;
diff --git a/backend/ontology-frontend/pom.xml b/backend/ontology-frontend/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>ontology</groupId>
         <artifactId>ontology-parent</artifactId>
-        <version>2025.12.0</version>
+        <version>2025.12.2</version>
         <relativePath>../ontology-parent</relativePath>
     </parent>
     <groupId>ontology</groupId>
diff --git a/backend/ontology-model/pom.xml b/backend/ontology-model/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>ontology</groupId>
         <artifactId>ontology-parent</artifactId>
-        <version>2025.12.0</version>
+        <version>2025.12.2</version>
         <relativePath>../ontology-parent</relativePath>
     </parent>
     <artifactId>ontology-model</artifactId>
diff --git a/backend/ontology-model/src/main/java/fr/obeo/ontology/configuration/OntologyEMFConfiguration.java b/backend/ontology-model/src/main/java/fr/obeo/ontology/configuration/OntologyEMFConfiguration.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package fr.obeo.ontology.configuration;
 
-import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.obeonetwork.dsl.entity.provider.EntityItemProviderAdapterFactory;
 import org.obeonetwork.dsl.environment.provider.EnvironmentItemProviderAdapterFactory;
 import org.obeonetwork.dsl.technicalid.provider.TechnicalIDItemProviderAdapterFactory;
@@ -28,17 +28,17 @@
 public class OntologyEMFConfiguration {
 
     @Bean
-    public AdapterFactory environmentAdapterFactory() {
-        return new EnvironmentItemProviderAdapterFactory();
+    public ComposedAdapterFactory.Descriptor environmentAdapterFactory() {
+        return EnvironmentItemProviderAdapterFactory::new;
     }
 
     @Bean
-    public AdapterFactory entityAdapterFactory() {
-        return new EntityItemProviderAdapterFactory();
+    public ComposedAdapterFactory.Descriptor entityAdapterFactory() {
+        return EntityItemProviderAdapterFactory::new;
     }
 
     @Bean
-    public AdapterFactory technicalidAdapterFactory() {
-        return new TechnicalIDItemProviderAdapterFactory();
+    public ComposedAdapterFactory.Descriptor technicalidAdapterFactory() {
+        return TechnicalIDItemProviderAdapterFactory::new;
     }
 }
diff --git a/backend/ontology-owl/pom.xml b/backend/ontology-owl/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>ontology</groupId>
         <artifactId>ontology-parent</artifactId>
-        <version>2025.12.0</version>
+        <version>2025.12.2</version>
         <relativePath>../ontology-parent</relativePath>
     </parent>
     <artifactId>ontology-owl</artifactId>
diff --git a/backend/ontology-parent/pom.xml b/backend/ontology-parent/pom.xml
@@ -18,20 +18,20 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.7</version>
+        <version>3.5.9</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>ontology</groupId>
     <artifactId>ontology-parent</artifactId>
-    <version>2025.12.0</version>
+    <version>2025.12.2</version>
     <name>ontology-parent</name>
     <description>Parent Pom for ontology modules</description>
     <packaging>pom</packaging>
 
 
     <properties>
         <java.version>17</java.version>
-        <sirius.web.version>2025.12.0</sirius.web.version>
+        <sirius.web.version>2025.12.2</sirius.web.version>
         <sirius.version>7.2.0-SNAPSHOT</sirius.version>
         <sirius.emfjson.version>2.5.3-SNAPSHOT</sirius.emfjson.version>
         <entity.version>5.1.1</entity.version>
diff --git a/backend/ontology-starter/pom.xml b/backend/ontology-starter/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>ontology</groupId>
         <artifactId>ontology-parent</artifactId>
-        <version>2025.12.0</version>
+        <version>2025.12.2</version>
         <relativePath>../ontology-parent</relativePath>
     </parent>
     <artifactId>ontology-starter</artifactId>
diff --git a/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/project/OntologyProjectTemplateInitializer.java b/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/project/OntologyProjectTemplateInitializer.java
@@ -12,16 +12,17 @@
  *******************************************************************************/
 package fr.obeo.ontology.services.project;
 
-import java.util.Optional;
+import java.util.List;
 import java.util.UUID;
 
-import org.eclipse.sirius.components.core.RepresentationMetadata;
 import org.eclipse.sirius.components.core.api.IEditingContext;
+import org.eclipse.sirius.components.core.api.IEditingContextPersistenceService;
 import org.eclipse.sirius.components.emf.ResourceMetadataAdapter;
 import org.eclipse.sirius.components.emf.services.JSONResourceFactory;
 import org.eclipse.sirius.components.emf.services.api.IEMFEditingContext;
 import org.eclipse.sirius.components.events.ICause;
-import org.eclipse.sirius.web.application.project.services.api.IProjectTemplateInitializer;
+import org.eclipse.sirius.web.application.project.dto.CreateProjectInput;
+import org.eclipse.sirius.web.application.project.services.api.ISemanticDataInitializer;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,22 +31,29 @@
  * @author lfasani
  */
 @Service
-public class OntologyProjectTemplateInitializer implements IProjectTemplateInitializer {
+public class OntologyProjectTemplateInitializer implements ISemanticDataInitializer {
+    private final IEditingContextPersistenceService editingContextPersistenceService;
+
+    public OntologyProjectTemplateInitializer(IEditingContextPersistenceService editingContextPersistenceService) {
+        this.editingContextPersistenceService = editingContextPersistenceService;
+    }
+
     @Override
     public boolean canHandle(String projectTemplateId) {
         return OntologyProjectTemplateProvider.ONTOLOGY_EXAMPLE_TEMPLATE_ID.equals(projectTemplateId);
     }
 
     @Override
-    public Optional<RepresentationMetadata> handle(ICause cause, String projectTemplateId, IEditingContext editingContext) {
+    public void handle(ICause cause, IEditingContext editingContext, String projectTemplateId) {
         if (OntologyProjectTemplateProvider.ONTOLOGY_EXAMPLE_TEMPLATE_ID.equals(projectTemplateId)) {
-            return this.initializeOntologyModel(editingContext);
+            this.initializeOntologyModel(editingContext);
+
+            this.editingContextPersistenceService.persist(new CreateProjectInput(UUID.randomUUID(), "Ontology", OntologyProjectTemplateProvider.ONTOLOGY_EXAMPLE_TEMPLATE_ID, List.of()),
+                    editingContext);
         }
-        return Optional.empty();
     }
 
-    private Optional<RepresentationMetadata> initializeOntologyModel(IEditingContext editingContext) {
-        Optional<RepresentationMetadata> result = Optional.empty();
+    private void initializeOntologyModel(IEditingContext editingContext) {
         if (editingContext instanceof IEMFEditingContext emfEditingContext) {
             var documentId = UUID.randomUUID();
             var resource = new JSONResourceFactory().createResourceFromPath(documentId.toString());
@@ -55,6 +63,5 @@ private Optional<RepresentationMetadata> initializeOntologyModel(IEditingContext
 
             resource.getContents().addAll(new OntologySampleBuilder().getEmptySampleContent());
         }
-        return result;
     }
 }
diff --git a/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/details/OntologyPropertiesDescriptionRegistryConfigurer.java b/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/details/OntologyPropertiesDescriptionRegistryConfigurer.java
@@ -6,6 +6,7 @@
 import java.util.UUID;
 import java.util.function.Predicate;
 
+import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -48,14 +49,15 @@ public class OntologyPropertiesDescriptionRegistryConfigurer implements IPropert
 
     private final IPropertiesWidgetCreationService propertiesWidgetCreationService;
 
-    private final ComposedAdapterFactory composedAdapterFactory;
+    private final List<ComposedAdapterFactory.Descriptor> composedAdapterFactoryDescriptors;
 
     private final RadioDescriptionProvider radioDescriptionProvider;
 
-    public OntologyPropertiesDescriptionRegistryConfigurer(IPropertiesConfigurerService propertiesConfigurerService, ComposedAdapterFactory composedAdapterFactory,
-            IPropertiesWidgetCreationService propertiesWidgetCreationService, RadioDescriptionProvider radioDescriptionProvider) {
+    public OntologyPropertiesDescriptionRegistryConfigurer(IPropertiesConfigurerService propertiesConfigurerService,
+            IPropertiesWidgetCreationService propertiesWidgetCreationService, List<ComposedAdapterFactory.Descriptor> composedAdapterFactoryDescriptors,
+            RadioDescriptionProvider radioDescriptionProvider) {
         this.propertiesWidgetCreationService = Objects.requireNonNull(propertiesWidgetCreationService);
-        this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory);
+        this.composedAdapterFactoryDescriptors = composedAdapterFactoryDescriptors;
         this.radioDescriptionProvider = Objects.requireNonNull(radioDescriptionProvider);
     }
 
@@ -189,7 +191,14 @@ private List<?> getChoiceOfValue(VariableManager variableManager, EStructuralFea
         var optionalEObject = variableManager.get(VariableManager.SELF, EObject.class);
         if (optionalEObject.isPresent()) {
             EObject eObject = optionalEObject.get();
-            Object adapter = this.composedAdapterFactory.adapt(eObject, IItemPropertySource.class);
+
+            List<AdapterFactory> adapterFactories = this.composedAdapterFactoryDescriptors.stream()
+                    .map(ComposedAdapterFactory.Descriptor::createAdapterFactory)
+                    .toList();
+            var composedAdapterFactory = new ComposedAdapterFactory(adapterFactories);
+            Object adapter = composedAdapterFactory.adapt(eObject, IItemPropertySource.class);
+            composedAdapterFactory.dispose();
+
             if (adapter instanceof IItemPropertySource itemPropertySource) {
                 IItemPropertyDescriptor descriptor = itemPropertySource.getPropertyDescriptor(eObject, feature);
                 if (descriptor != null) {
diff --git a/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/details/RadioDescriptionProvider.java b/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/details/RadioDescriptionProvider.java
@@ -8,6 +8,7 @@
 import java.util.function.Function;
 
 import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClassifier;
@@ -42,14 +43,15 @@ public class RadioDescriptionProvider {
 
     private final Logger logger = LoggerFactory.getLogger(RadioDescriptionProvider.class);
 
-    private final ComposedAdapterFactory composedAdapterFactory;
+    private final List<ComposedAdapterFactory.Descriptor> composedAdapterFactoryDescriptors;
 
     private final IPropertiesValidationProvider propertiesValidationProvider;
 
     private final Function<VariableManager, String> semanticTargetIdProvider;
 
-    public RadioDescriptionProvider(ComposedAdapterFactory composedAdapterFactory, IPropertiesValidationProvider propertiesValidationProvider, IIdentityService identityService) {
-        this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory);
+    public RadioDescriptionProvider(List<ComposedAdapterFactory.Descriptor> composedAdapterFactoryDescriptors,
+            IPropertiesValidationProvider propertiesValidationProvider, IIdentityService identityService) {
+        this.composedAdapterFactoryDescriptors = composedAdapterFactoryDescriptors;
         this.propertiesValidationProvider = Objects.requireNonNull(propertiesValidationProvider);
         this.semanticTargetIdProvider = variableManager -> variableManager.get(VariableManager.SELF, Object.class)
                 .map(identityService::getId)
@@ -105,13 +107,20 @@ private Function<VariableManager, String> getOptionLabelProvider(EStructuralFeat
             Object literal = variables.get("candidate");
             String result = "";
             if (object instanceof EObject eObject) {
-                Adapter adapter = this.composedAdapterFactory.adapt(eObject, IItemPropertySource.class);
+                List<AdapterFactory> adapterFactories = this.composedAdapterFactoryDescriptors.stream()
+                        .map(ComposedAdapterFactory.Descriptor::createAdapterFactory)
+                        .toList();
+                var composedAdapterFactory = new ComposedAdapterFactory(adapterFactories);
+                Adapter adapter = composedAdapterFactory.adapt(eObject, IItemPropertySource.class);
+                composedAdapterFactory.dispose();
+
                 if (adapter instanceof IItemPropertySource itemPropertySource) {
                     IItemPropertyDescriptor descriptor = itemPropertySource.getPropertyDescriptor(eObject, feature);
                     if (descriptor != null) {
                         result = descriptor.getLabelProvider(eObject).getText(literal);
                     }
                 }
+
             }
 
             if (result.isEmpty() && literal instanceof Enumerator enumerator) {
diff --git a/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/modelexplorer/OntologyEditServiceDelegate.java b/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/modelexplorer/OntologyEditServiceDelegate.java
@@ -9,6 +9,7 @@
 
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -45,12 +46,13 @@ public class OntologyEditServiceDelegate implements IEditServiceDelegate {
 
     private final OntologyEditingContextPredicate ontologyEditingContextPredicate;
 
-    private final ComposedAdapterFactory composedAdapterFactory;
+    private final List<ComposedAdapterFactory.Descriptor> composedAdapterFactoryDescriptors;
 
-    public OntologyEditServiceDelegate(IDefaultEditService defaultEditService, OntologyEditingContextPredicate ontologyEditingContextPredicate, ComposedAdapterFactory composedAdapterFactory) {
+    public OntologyEditServiceDelegate(IDefaultEditService defaultEditService, OntologyEditingContextPredicate ontologyEditingContextPredicate,
+            List<ComposedAdapterFactory.Descriptor> composedAdapterFactoryDescriptors) {
         this.defaultEditService = Objects.requireNonNull(defaultEditService);
         this.ontologyEditingContextPredicate = Objects.requireNonNull(ontologyEditingContextPredicate);
-        this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory);
+        this.composedAdapterFactoryDescriptors = composedAdapterFactoryDescriptors;
     }
 
     @Override
@@ -87,8 +89,15 @@ private String computeLabel(EClass eClass, AdapterFactoryEditingDomain adapterFa
     }
 
     private boolean filterByClasses(ChildCreationDescription childCreationDescription, List<EClass> classesToKeep) {
-        AdapterFactoryEditingDomain adapterFactoryEditingDomain = new AdapterFactoryEditingDomain(this.composedAdapterFactory, new BasicCommandStack());
+        List<AdapterFactory> adapterFactories = this.composedAdapterFactoryDescriptors.stream()
+                .map(ComposedAdapterFactory.Descriptor::createAdapterFactory)
+                .toList();
+        var composedAdapterFactory = new ComposedAdapterFactory(adapterFactories);
+
+        AdapterFactoryEditingDomain adapterFactoryEditingDomain = new AdapterFactoryEditingDomain(composedAdapterFactory, new BasicCommandStack());
         List<String> eClassifierLabels = classesToKeep.stream().map(eClass -> this.computeLabel(eClass, adapterFactoryEditingDomain)).toList();
+        composedAdapterFactory.dispose();
+
         return eClassifierLabels.contains(childCreationDescription.label());
     }
 
diff --git a/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/modelexplorer/OntologyTreeFilterProvider.java b/backend/ontology-starter/src/main/java/fr/obeo/ontology/services/representations/modelexplorer/OntologyTreeFilterProvider.java
@@ -34,7 +34,7 @@ public class OntologyTreeFilterProvider implements ITreeFilterProvider {
     public static final String HIDE_ATTRIBUTES_TREE_FILTER_ID = UUID.nameUUIDFromBytes("OntologyAttributesTreeItemFilter".getBytes()).toString();
 
     @Override
-    public List<TreeFilter> get(String editingContextId, TreeDescription treeDescription, String representationId) {
+    public List<TreeFilter> get(String editingContextId, TreeDescription treeDescription) {
         List<TreeFilter> filters = new ArrayList<>();
 //        if (treeDescription.getLabel().equals(ViewExplorerTreeDescriptionBuilder.ONTOLOGY_EXPLORER_DESCRIPTION_NAME)) {
         filters.add(new TreeFilter(HIDE_COMMENTS_TREE_ITEM_FILTER_ID, "Hide Comments", true));
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -18,7 +18,7 @@
 
     <groupId>ontology</groupId>
     <artifactId>ontology-container</artifactId>
-    <version>2025.12.0</version>
+    <version>2025.12.2</version>
 
     <name>Ontology</name>
     <description>Ontology</description>
diff --git a/frontend/ontology-web/package.json b/frontend/ontology-web/package.json
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
