Skip to content

springboot 3.5.11 #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AbdelHedhili wants to merge 5 commits into
base: main
Choose a base branch
from
Open

springboot 3.5.11 #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39eda2d
springboot 3.5.11
AbdelHedhili Mar 23, 2026
a9ea239
Merge branch 'main' into springboot_3.5.11
AbdelHedhili Mar 23, 2026
512796f
network-modif 0.73.0
AbdelHedhili Mar 26, 2026
6300f7b
Merge branch 'springboot_3.5.11' of https://github.com/gridsuite/netw…
AbdelHedhili Mar 26, 2026
a0562a4
Merge branch 'main' into springboot_3.5.11
AbdelHedhili Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,15 @@
</developers>

<properties>
<gridsuite-dependencies.version>49.0.0</gridsuite-dependencies.version>
<gridsuite-dependencies.version>50.0.0</gridsuite-dependencies.version>
<db-util.version>1.0.5</db-util.version>
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
<liquibase-hibernate-package>org.gridsuite.modification.server</liquibase-hibernate-package>
<sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
<!-- TODO network-modification.version remove when included in gridsuite-dependencies -->
<network-modification.version>0.72.0</network-modification.version>
<!-- TODO network-store.version remove when included in powsybl-ws-dependencies -->
<network-store-client.version>1.39.0</network-store-client.version>
<!-- FIXME to remove when powsybl-ws-dependencies upgrades to springboot 3.5.9 -->
<testcontainers.version>1.21.4</testcontainers.version>
<network-modification.version>0.73.0</network-modification.version>
</properties>

<build>
Expand Down Expand Up @@ -92,36 +88,12 @@
<dependencyManagement>
<dependencies>
<!-- overrides of imports -->
<!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-network-store-client</artifactId>
<version>${network-store-client.version}</version>
</dependency>
<!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-network-store-iidm-impl</artifactId>
<version>${network-store-client.version}</version>
</dependency>
<!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-network-store-model</artifactId>
<version>${network-store-client.version}</version>
</dependency>
<!-- FIXME: to be removed at next gridsuite-dependencies upgrade -->
<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-network-modification</artifactId>
<version>${network-modification.version}</version>
</dependency>
<!-- FIXME to remove when powsybl-ws-dependencies upgrades to springboot 3.5.9 -->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
</dependency>
<dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/gridsuite/modification/server/modifications/LineCreationInBusBreakerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ void testCreateLineOptionalParameters5() throws Exception {
String lineCreationInfosPermanentLimitNOKJson = getJsonBody(lineCreationInfosPermanentLimitNOK, null);
mockMvc.perform(post(getNetworkModificationUri()).content(lineCreationInfosPermanentLimitNOKJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
assertLogMessage("AC Line 'idLine2': permanent limit must be >= 0", ERROR_MESSAGE_KEY, reportService);
assertLogMessage("AC line 'idLine2': permanent limit must be >= 0", ERROR_MESSAGE_KEY, reportService);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...t/java/org/gridsuite/modification/server/modifications/LineCreationInNodeBreakerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ void testCreateWithErrors() throws Exception {
lineCreationInfosJson = getJsonBody(lineCreationInfos, null);
mockMvc.perform(post(getNetworkModificationUri()).content(lineCreationInfosJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
assertLogMessage("AC Line 'idLine4': r is invalid", ERROR_MESSAGE_KEY, reportService);
assertLogMessage("AC line 'idLine4': r is invalid", ERROR_MESSAGE_KEY, reportService);

lineCreationInfos.setR(100.0);
lineCreationInfos.setX(Double.NaN);
lineCreationInfosJson = getJsonBody(lineCreationInfos, null);
mockMvc.perform(post(getNetworkModificationUri()).content(lineCreationInfosJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
assertLogMessage("AC Line 'idLine4': x is invalid", ERROR_MESSAGE_KEY, reportService);
assertLogMessage("AC line 'idLine4': x is invalid", ERROR_MESSAGE_KEY, reportService);

// try to create an existing line
lineCreationInfos.setEquipmentId("line2");
Expand Down
Loading