Fix bump to rc2

Signed-off-by: lisrte <[email protected]>
powsybl · Jun 24, 2024 · c7346c5 · c7346c5
1 parent 1463e65
commit c7346c5
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 20 deletions.
diff --git a/commons/src/test/resources/mergedLoadsMultiBusesVl.xiidm b/commons/src/test/resources/mergedLoadsMultiBusesVl.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiBusesVl" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiBusesVl" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/commons/src/test/resources/mergedLoadsPnQn.xiidm b/commons/src/test/resources/mergedLoadsPnQn.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/commons/src/test/resources/mergedLoadsPnQp.xiidm b/commons/src/test/resources/mergedLoadsPnQp.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/commons/src/test/resources/mergedLoadsPpQn.xiidm b/commons/src/test/resources/mergedLoadsPpQn.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/commons/src/test/resources/mergedLoadsPpQp.xiidm b/commons/src/test/resources/mergedLoadsPpQp.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/commons/src/test/resources/mergedThreeLoadsGroups.xiidm b/commons/src/test/resources/mergedThreeLoadsGroups.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/commons/src/test/resources/nonMergeableLoads.xiidm b/commons/src/test/resources/nonMergeableLoads.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="multiLoads" caseDate="2023-02-17T05:41:11.194+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="250.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/dynaflow/src/test/resources/output.xiidm b/dynaflow/src/test/resources/output.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="test" caseDate="2023-02-17T04:49:40.620+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="test" caseDate="2023-02-17T04:49:40.620+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="400.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/dynaflow/src/test/resources/outputMergedLoads.xiidm b/dynaflow/src/test/resources/outputMergedLoads.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="test" caseDate="2023-02-17T04:57:37.251+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="test" caseDate="2023-02-17T04:57:37.251+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="400.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsJsonDeserializer.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigsJsonDeserializer.java
@@ -29,7 +29,7 @@ public ModelConfigsJsonDeserializer() {
     public Map<String, ModelConfigs> deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         Map<String, ModelConfigs> configMap = new HashMap<>();
         while (parser.nextToken() != JsonToken.END_OBJECT) {
-            String category = parser.getCurrentName();
+            String category = parser.currentName();
             parser.nextToken();
             configMap.put(category, parseModelConfigs(parser));
         }
@@ -65,7 +65,7 @@ private static ModelConfig parseModelConfig(JsonParser parser) {
             List<String> properties = Collections.emptyList();
         };
         JsonUtil.parseObject(parser, name ->
-            switch (parser.getCurrentName()) {
+            switch (parser.currentName()) {
                 case "lib" -> {
                     parsingContext.lib = parser.nextTextValue();
                     yield true;

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/JobsXml.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/JobsXml.java
@@ -81,8 +81,8 @@ private static void writeModeler(XMLStreamWriter writer, DynaWaltzContext contex
 
     private static void writeSimulation(XMLStreamWriter writer, DynaWaltzContext context) throws XMLStreamException {
         writer.writeEmptyElement(DYN_URI, "simulation");
-        writer.writeAttribute("startTime", Integer.toString(context.getParameters().getStartTime()));
-        writer.writeAttribute("stopTime", Integer.toString(context.getParameters().getStopTime()));
+        writer.writeAttribute("startTime", Double.toString(context.getParameters().getStartTime()));
+        writer.writeAttribute("stopTime", Double.toString(context.getParameters().getStopTime()));
         writer.writeAttribute("precision", Double.toString(context.getDynaWaltzParameters().getPrecision()));
     }
 

diff --git a/dynawaltz/src/test/resources/DynaWaltzParameters.json b/dynawaltz/src/test/resources/DynaWaltzParameters.json
@@ -1,7 +1,7 @@
 {
   "version" : "1.0",
-  "startTime" : 0,
-  "stopTime" : 3600,
+  "startTime" : 0.0,
+  "stopTime" : 3600.0,
   "extensions" : {
     "DynaWaltzParameters" : {
       "networkParameters" : {

diff --git a/dynawaltz/src/test/resources/jobs.xml b/dynawaltz/src/test/resources/jobs.xml
@@ -8,7 +8,7 @@
             <dyn:precompiledModels useStandardModels="true"/>
             <dyn:modelicaModels useStandardModels="false"/>
         </dyn:modeler>
-        <dyn:simulation startTime="1" stopTime="100" precision="1.0E-6"/>
+        <dyn:simulation startTime="1.0" stopTime="100.0" precision="1.0E-6"/>
         <dyn:outputs directory="outputs">
             <dyn:dumpInitValues local="false" global="false"/>
             <dyn:timeline exportMode="TXT"/>

diff --git a/dynawaltz/src/test/resources/jobsWithDump.xml b/dynawaltz/src/test/resources/jobsWithDump.xml
@@ -9,7 +9,7 @@
             <dyn:precompiledModels useStandardModels="true"/>
             <dyn:modelicaModels useStandardModels="false"/>
         </dyn:modeler>
-        <dyn:simulation startTime="1" stopTime="100" precision="1.0E-6"/>
+        <dyn:simulation startTime="1.0" stopTime="100.0" precision="1.0E-6"/>
         <dyn:outputs directory="outputs">
             <dyn:dumpInitValues local="false" global="false"/>
             <dyn:timeline exportMode="TXT"/>

diff --git a/dynawaltz/src/test/resources/mergedLoads.xiidm b/dynawaltz/src/test/resources/mergedLoads.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="test" caseDate="2023-02-16T16:03:32.005+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="test" caseDate="2023-02-16T16:03:32.005+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="400.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/dynawaltz/src/test/resources/noMergedLoads.xiidm b/dynawaltz/src/test/resources/noMergedLoads.xiidm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_12" id="test" caseDate="2023-02-16T16:05:53.078+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
+<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_13" id="test" caseDate="2023-02-16T16:05:53.078+01:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
     <iidm:substation id="substation">
         <iidm:voltageLevel id="vl1" nominalV="400.0" topologyKind="NODE_BREAKER">
             <iidm:nodeBreakerTopology>

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <powsyblcore.version>6.4.0-SNAPSHOT</powsyblcore.version>
+        <powsyblcore.version>6.4.0-RC2</powsyblcore.version>
         <groovy.version>4.0.14</groovy.version> <!-- used for groovy-json but also for groovydoc (dynawaltz-dsl) -->
         <sonar.coverage.jacoco.xmlReportPaths>
             ../distribution/target/site/jacoco-aggregate/jacoco.xml,