Merge branch 'develop' into refactor_release_please_worflow

Signed-off-by: Steffen van den Driest <[email protected]>

Author: Stef3st

.github/workflows/build-project.yml

@@ -39,7 +39,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

.github/workflows/release-please.yml

@@ -16,7 +16,7 @@ jobs:
   release_please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - uses: google-github-actions/release-please-action@v4
         id: release
         with:
           release-type: maven
@@ -48,7 +48,7 @@ jobs:
 
       - name: Set up JDK 17
         if: ${{ steps.release.outputs.release_created }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

.github/workflows/sonarcloud-analysis.yml

@@ -67,7 +67,7 @@ jobs:
         restore-keys: ${{ runner.os }}-m2
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '17'

.github/workflows/sonarcloud-build.yml

@@ -44,7 +44,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

pom.xml

@@ -20,14 +20,14 @@ SPDX-License-Identifier: Apache-2.0
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
-        <surefire-plugin.version>3.2.2</surefire-plugin.version>
+        <surefire-plugin.version>3.2.3</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
         <compas.core.version>0.11.0</compas.core.version>
 
         <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
         <microprofile-openapi-api.version>3.1.1</microprofile-openapi-api.version>
-        <powsybl.version>5.1.1</powsybl.version>
+        <powsybl.version>6.1.0</powsybl.version>
         <log4j2.version>2.22.0</log4j2.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <openpojo.version>0.9.1</openpojo.version>
@@ -261,7 +261,7 @@ SPDX-License-Identifier: Apache-2.0
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>3.6.2</version>
+                            <version>3.6.3</version>
                             <executions>
                                 <execution>
                                     <id>attach-javadocs</id>

service/src/test/java/org/lfenergy/compas/cim/mapping/mapper/CimToSclMapperContextTest.java

@@ -38,7 +38,7 @@ void getSubstations_WhenCalled_ThenPropertyBagsIsConvertedToCgmesSubstation() {
         var substationName = "Name Substation";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(SUBSTATION_PROP, NAME_PROP));
+        var bag = new PropertyBag(List.of(SUBSTATION_PROP, NAME_PROP), true);
         bag.put(SUBSTATION_PROP, substationId);
         bag.put(NAME_PROP, substationName);
         bags.add(bag);
@@ -60,7 +60,7 @@ void getVoltageLevelsBySubstation_WhenCalledWithKnownId_ThenPropertyBagsIsFilter
         var substationId = "Known Substation ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(VOLTAGE_LEVEL_PROP, NAME_PROP, NOMINAL_VOLTAGE_PROP, SUBSTATION_PROP));
+        var bag = new PropertyBag(List.of(VOLTAGE_LEVEL_PROP, NAME_PROP, NOMINAL_VOLTAGE_PROP, SUBSTATION_PROP), true);
         bag.put(VOLTAGE_LEVEL_PROP, voltageLevelId);
         bag.put(NAME_PROP, voltageLevelName);
         bag.put(NOMINAL_VOLTAGE_PROP, "1.0");
@@ -84,7 +84,7 @@ void getBusbarSectionsByEquipmentContainer_WhenSparQLReturnsBags_ThenPropertyBag
         var equipmentContainerId = "ContainerId";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(BUSBARSECTION_PROP, NAME_PROP, EQUIPMENT_CONTAINER_PROP));
+        var bag = new PropertyBag(List.of(BUSBARSECTION_PROP, NAME_PROP, EQUIPMENT_CONTAINER_PROP), true);
         bag.put(BUSBARSECTION_PROP, busbarSectionId);
         bag.put(NAME_PROP, busbarSectionName);
         bag.put(EQUIPMENT_CONTAINER_PROP, equipmentContainerId);
@@ -107,7 +107,7 @@ void getBaysByVoltageLevel_WhenSparQLReturnsBags_ThenPropertyBagIsConvertedToCgm
         var voltageLevelId = "VoltageLevelId";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(BAY_PROP, NAME_PROP, VOLTAGE_LEVEL_PROP));
+        var bag = new PropertyBag(List.of(BAY_PROP, NAME_PROP, VOLTAGE_LEVEL_PROP), true);
         bag.put(BAY_PROP, bayId);
         bag.put(NAME_PROP, bayName);
         bag.put(VOLTAGE_LEVEL_PROP, voltageLevelId);
@@ -131,7 +131,7 @@ void getTransformers_WhenSparQLReturnsBags_ThenPropertyBagIsConvertedToCgmesTran
         var pwContainerId = "Known Container ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(POWER_TRANSFORMER_PROP, NAME_PROP, DESCRIPTION_PROP, EQUIPMENT_CONTAINER_PROP));
+        var bag = new PropertyBag(List.of(POWER_TRANSFORMER_PROP, NAME_PROP, DESCRIPTION_PROP, EQUIPMENT_CONTAINER_PROP),true);
         bag.put(POWER_TRANSFORMER_PROP, pwId);
         bag.put(NAME_PROP, pwName);
         bag.put(DESCRIPTION_PROP, pwDesc);
@@ -158,7 +158,7 @@ void getTransformerEnds_WhenCalledWithKnownId_ThenPropertyBagsIsFilteredOnIdAndC
         var endNumber = "1";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(TRANSFORMER_END_PROP, NAME_PROP, POWER_TRANSFORMER_PROP, TERMINAL_PROP, END_NUMBER_PROP));
+        var bag = new PropertyBag(List.of(TRANSFORMER_END_PROP, NAME_PROP, POWER_TRANSFORMER_PROP, TERMINAL_PROP, END_NUMBER_PROP), true);
         bag.put(TRANSFORMER_END_PROP, tfeId);
         bag.put(NAME_PROP, tfeName);
         bag.put(POWER_TRANSFORMER_PROP, tfId);
@@ -200,7 +200,7 @@ void getTapChanger_WhenRatioTapChangersFound_ThenConvertedRatioTapChangerReturne
 
         var ratioBags = new PropertyBags();
 
-        var bag = new PropertyBag(List.of(RATIO_TAP_CHANGER_PROP, NAME_PROP, TRANSFORMER_END_PROP));
+        var bag = new PropertyBag(List.of(RATIO_TAP_CHANGER_PROP, NAME_PROP, TRANSFORMER_END_PROP), true);
         bag.put(RATIO_TAP_CHANGER_PROP, tcId);
         bag.put(NAME_PROP, tcName);
         bag.put(TRANSFORMER_END_PROP, tfeId);
@@ -224,7 +224,7 @@ void getTapChanger_WhenNoRatioTapChangerFoundButPhaseTapChangersFound_ThenConver
         var ratioBags = new PropertyBags();
         var phaseBags = new PropertyBags();
 
-        var bag = new PropertyBag(List.of(PHASE_TAP_CHANGER_PROP, NAME_PROP, TRANSFORMER_END_PROP));
+        var bag = new PropertyBag(List.of(PHASE_TAP_CHANGER_PROP, NAME_PROP, TRANSFORMER_END_PROP), true);
         bag.put(PHASE_TAP_CHANGER_PROP, tcId);
         bag.put(NAME_PROP, tcName);
         bag.put(TRANSFORMER_END_PROP, tfeId);
@@ -246,7 +246,7 @@ void getConnectivityNodeByBusbarSection_WhenCalledWithKnownId_ThenPropertyBagsIs
         var busbarSectionId = "BusbarSection ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(CONNECTIVITY_NODE_PROP, NAME_PROP, CONDUCTING_EQUIPMENT_PROP));
+        var bag = new PropertyBag(List.of(CONNECTIVITY_NODE_PROP, NAME_PROP, CONDUCTING_EQUIPMENT_PROP), true);
         bag.put(CONNECTIVITY_NODE_PROP, ccnId);
         bag.put(NAME_PROP, ccnName);
         bag.put(CONDUCTING_EQUIPMENT_PROP, busbarSectionId);
@@ -269,7 +269,7 @@ void getConnectivityNodeByBay_WhenCalledWithKnownId_ThenPropertyBagsIsConvertedT
         var bayID = "Bay ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(CONNECTIVITY_NODE_PROP, NAME_PROP, EQUIPMENT_CONTAINER_PROP));
+        var bag = new PropertyBag(List.of(CONNECTIVITY_NODE_PROP, NAME_PROP, EQUIPMENT_CONTAINER_PROP), true);
         bag.put(CONNECTIVITY_NODE_PROP, ccnId);
         bag.put(NAME_PROP, ccnName);
         bag.put(EQUIPMENT_CONTAINER_PROP, bayID);
@@ -292,7 +292,7 @@ void getSwitches_WhenCalledWithKnownId_ThenPropertyBagsIsFilteredOnIdAndConverte
         var containerId = "Known Container ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(SWITCH_PROP, NAME_PROP, TYPE_PROP, EQUIPMENT_CONTAINER_PROP));
+        var bag = new PropertyBag(List.of(SWITCH_PROP, NAME_PROP, TYPE_PROP, EQUIPMENT_CONTAINER_PROP), true);
         bag.put(SWITCH_PROP, switchId);
         bag.put(NAME_PROP, switchName);
         bag.put(TYPE_PROP, "Breaker");
@@ -317,7 +317,7 @@ void getTerminalsByConductingEquipment_WhenCalledWithKnownId_ThenPropertyBagsIsF
         var containerId = "Known Container ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(TERMINAL_PROP, NAME_PROP, CONNECTIVITY_NODE_PROP));
+        var bag = new PropertyBag(List.of(TERMINAL_PROP, NAME_PROP, CONNECTIVITY_NODE_PROP), true);
         bag.put(TERMINAL_PROP, terminalId);
         bag.put(NAME_PROP, terminalName);
         bag.put(CONNECTIVITY_NODE_PROP, ccnNode);
@@ -343,7 +343,7 @@ void getTerminalById_WhenCalledWithKnownId_ThenPropertyBagsIsFilteredOnIdAndConv
         var ccnNode = "Connectivity Node ID";
 
         var bags = new PropertyBags();
-        var bag = new PropertyBag(List.of(TERMINAL_PROP, NAME_PROP, CONNECTIVITY_NODE_PROP));
+        var bag = new PropertyBag(List.of(TERMINAL_PROP, NAME_PROP, CONNECTIVITY_NODE_PROP), true);
         bag.put(TERMINAL_PROP, terminalId);
         bag.put(NAME_PROP, terminalName);
         bag.put(CONNECTIVITY_NODE_PROP, ccnNode);