From 1f56154e1eb6d9a5ce570b217c80fdcd48b50991 Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Fri, 9 Jan 2026 08:47:35 +0100
Subject: [PATCH 1/3] powsybl-dependencies v2025.3.0

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 pom.xml                                          | 16 +---------------
 .../parameters/LoadFlowParametersEntity.java     |  6 +++---
 .../changesets/changelog_20260801T170000Z.xml    | 13 +++++++++++++
 .../db/changelog/db.changelog-master.yaml        |  3 +++
 4 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changesets/changelog_20260801T170000Z.xml

diff --git a/pom.xml b/pom.xml
index 8dfd509a..d031ff1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,10 +45,7 @@
 
         <jib.from.image>powsybl/java-dynawo:3.1.0</jib.from.image>
         <liquibase-hibernate-package>org.gridsuite.loadflow.server</liquibase-hibernate-package>
-        <gridsuite-dependencies.version>46.0.0</gridsuite-dependencies.version>
-        <!-- TODO remove gridsuite-filter.version and computation.version when upgrading gridsuite dependencies -->
-        <gridsuite-filter.version>1.16.0</gridsuite-filter.version>
-        <gridsuite-computation.version>1.9.0</gridsuite-computation.version>
+        <gridsuite-dependencies.version>46.1.0-SNAPSHOT</gridsuite-dependencies.version>
         <!--
         antlr4 from openloadflow conflicts ? Only on repository.count() method in this project..
         [ERROR] org.gridsuite.loadflow.server.SupervisionControllerTest.testResultCount <<< ERROR!
@@ -97,17 +94,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.gridsuite</groupId>
-                <artifactId>gridsuite-computation</artifactId>
-                <version>${gridsuite-computation.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.gridsuite</groupId>
-                <artifactId>gridsuite-filter</artifactId>
-                <version>${gridsuite-filter.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.gridsuite</groupId>
diff --git a/src/main/java/org/gridsuite/loadflow/server/entities/parameters/LoadFlowParametersEntity.java b/src/main/java/org/gridsuite/loadflow/server/entities/parameters/LoadFlowParametersEntity.java
index b9c2eaef..3cb03f26 100644
--- a/src/main/java/org/gridsuite/loadflow/server/entities/parameters/LoadFlowParametersEntity.java
+++ b/src/main/java/org/gridsuite/loadflow/server/entities/parameters/LoadFlowParametersEntity.java
@@ -88,7 +88,7 @@ public class LoadFlowParametersEntity {
 
     @Column(name = "connectedComponentMode")
     @Enumerated(EnumType.STRING)
-    private LoadFlowParameters.ConnectedComponentMode connectedComponentMode;
+    private LoadFlowParameters.ComponentMode connectedComponentMode;
 
     @Column(name = "hvdcAcEmulation", columnDefinition = "boolean default true", nullable = false)
     private boolean hvdcAcEmulation = true;
@@ -175,7 +175,7 @@ private void assignCommonValues(LoadFlowParameters allCommonValues) {
         balanceType = allCommonValues.getBalanceType();
         dcUseTransformerRatio = allCommonValues.isDcUseTransformerRatio();
         countriesToBalance = allCommonValues.getCountriesToBalance().stream().map(Country::toString).collect(Collectors.toSet());
-        connectedComponentMode = allCommonValues.getConnectedComponentMode();
+        connectedComponentMode = allCommonValues.getComponentMode();
         hvdcAcEmulation = allCommonValues.isHvdcAcEmulation();
         dcPowerFactor = allCommonValues.getDcPowerFactor();
     }
@@ -205,7 +205,7 @@ public LoadFlowParameters toLoadFlowParameters() {
                 .setBalanceType(this.getBalanceType())
                 .setDcUseTransformerRatio(this.isDcUseTransformerRatio())
                 .setCountriesToBalance(this.getCountriesToBalance().stream().map(Country::valueOf).collect(Collectors.toSet()))
-                .setConnectedComponentMode(this.getConnectedComponentMode())
+                .setComponentMode(this.getConnectedComponentMode())
                 .setHvdcAcEmulation(this.isHvdcAcEmulation())
                 .setDcPowerFactor(this.getDcPowerFactor());
     }
diff --git a/src/main/resources/db/changelog/changesets/changelog_20260801T170000Z.xml b/src/main/resources/db/changelog/changesets/changelog_20260801T170000Z.xml
new file mode 100644
index 00000000..c10a5c4c
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20260801T170000Z.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="lesoteti" id="1764164817687-1">
+        <update tableName="load_flow_parameters">
+            <column name="connected_component_mode" value="MAIN_CONNECTED"/>
+            <where>connected_component_mode = 'MAIN'</where>
+        </update>
+        <update tableName="load_flow_parameters">
+            <column name="connected_component_mode" value="ALL_CONNECTED"/>
+            <where>connected_component_mode = 'ALL'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 52d37c6c..e3e317b6 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -54,3 +54,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20251126T134638Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20260801T170000Z.xml
+      relativeToChangelogFile: true

From 7c54aa06a73e7054e7aa65e9923a51e5f975db58 Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Fri, 9 Jan 2026 08:50:21 +0100
Subject: [PATCH 2/3] fix

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d031ff1f..63eb3117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 
         <jib.from.image>powsybl/java-dynawo:3.1.0</jib.from.image>
         <liquibase-hibernate-package>org.gridsuite.loadflow.server</liquibase-hibernate-package>
-        <gridsuite-dependencies.version>46.1.0-SNAPSHOT</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>47.0.0</gridsuite-dependencies.version>
         <!--
         antlr4 from openloadflow conflicts ? Only on repository.count() method in this project..
         [ERROR] org.gridsuite.loadflow.server.SupervisionControllerTest.testResultCount <<< ERROR!

From 7b1dd2040fd2107beff644f543ea6d7bbdac51cd Mon Sep 17 00:00:00 2001
From: Etienne LESOT <etienne.lesot@rte-france.com>
Date: Mon, 19 Jan 2026 15:23:39 +0100
Subject: [PATCH 3/3] empty commit to trigger ci