From a74fcb83b7adecbf23e334d0b29995b457b501e5 Mon Sep 17 00:00:00 2001 From: Etienne LESOT Date: Thu, 8 Jan 2026 16:43:06 +0100 Subject: [PATCH 1/2] powsybl-dependencies v2025.3.0 Signed-off-by: Etienne LESOT --- pom.xml | 2 +- .../org/gridsuite/actions/server/ContingencyListService.java | 4 ++-- .../actions/server/dto/FilterBasedContingencyList.java | 2 +- .../gridsuite/actions/server/dto/IdBasedContingencyList.java | 4 ++-- .../actions/server/dto/PersistentContingencyList.java | 2 +- .../actions/server/entities/IdBasedContingencyListEntity.java | 2 +- .../actions/server/ContingencyListControllerTest.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index f38a359a..aa16990b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - 46.0.0 + 47.0.0 org.gridsuite.actions.server gridsuite org.gridsuite:actions-server diff --git a/src/main/java/org/gridsuite/actions/server/ContingencyListService.java b/src/main/java/org/gridsuite/actions/server/ContingencyListService.java index 0c6ecfd6..cd85191c 100644 --- a/src/main/java/org/gridsuite/actions/server/ContingencyListService.java +++ b/src/main/java/org/gridsuite/actions/server/ContingencyListService.java @@ -9,8 +9,8 @@ import com.powsybl.commons.PowsyblException; import com.powsybl.contingency.Contingency; import com.powsybl.contingency.ContingencyElement; -import com.powsybl.contingency.contingency.list.ContingencyList; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.ContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.iidm.network.Connectable; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.Terminal; diff --git a/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java b/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java index d06918b8..871dafbc 100644 --- a/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java +++ b/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java @@ -6,7 +6,7 @@ */ package org.gridsuite.actions.server.dto; -import com.powsybl.contingency.contingency.list.ContingencyList; +import com.powsybl.contingency.list.ContingencyList; import com.powsybl.iidm.network.Network; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java b/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java index 650427c7..2be54cc1 100644 --- a/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java +++ b/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java @@ -6,8 +6,8 @@ */ package org.gridsuite.actions.server.dto; -import com.powsybl.contingency.contingency.list.ContingencyList; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.ContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.iidm.network.Network; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java b/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java index a74e9b36..58885d21 100644 --- a/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java +++ b/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java @@ -6,7 +6,7 @@ */ package org.gridsuite.actions.server.dto; -import com.powsybl.contingency.contingency.list.ContingencyList; +import com.powsybl.contingency.list.ContingencyList; import com.powsybl.iidm.network.Network; import java.util.Map; diff --git a/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java b/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java index 2793fc58..50a39a6c 100644 --- a/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java +++ b/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java @@ -6,7 +6,7 @@ */ package org.gridsuite.actions.server.entities; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.iidm.network.identifiers.IdBasedNetworkElementIdentifier; import com.powsybl.iidm.network.identifiers.NetworkElementIdentifier; import com.powsybl.iidm.network.identifiers.NetworkElementIdentifierContingencyList; diff --git a/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java b/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java index 87cebe1c..56bc9a9a 100644 --- a/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java +++ b/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java @@ -16,7 +16,7 @@ import com.github.tomakehurst.wiremock.client.MappingBuilder; import com.github.tomakehurst.wiremock.client.WireMock; import com.powsybl.contingency.*; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.contingency.json.ContingencyJsonModule; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network; From fd63aa138c2d395622c4ff0662b44f250a6a71ac Mon Sep 17 00:00:00 2001 From: Etienne LESOT Date: Mon, 19 Jan 2026 15:23:21 +0100 Subject: [PATCH 2/2] empty commit to trigger ci