diff --git a/commons/pom.xml b/commons/pom.xml index d98730c3cf..8de8142d0a 100755 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -112,7 +112,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-api/pom.xml b/data/crac/crac-api/pom.xml index 885b010676..5ed9b94a4a 100644 --- a/data/crac/crac-api/pom.xml +++ b/data/crac/crac-api/pom.xml @@ -54,7 +54,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-impl/pom.xml b/data/crac/crac-impl/pom.xml index ca68f2b84a..dbae1ed4b5 100644 --- a/data/crac/crac-impl/pom.xml +++ b/data/crac/crac-impl/pom.xml @@ -99,7 +99,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-io/crac-io-cim/pom.xml b/data/crac/crac-io/crac-io-cim/pom.xml index 4a54169290..4f833c8e03 100644 --- a/data/crac/crac-io/crac-io-cim/pom.xml +++ b/data/crac/crac-io/crac-io-cim/pom.xml @@ -24,20 +24,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins @@ -63,8 +51,8 @@ ${project.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.apache.commons @@ -125,7 +113,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-io/crac-io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java b/data/crac/crac-io/crac-io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java index a121467956..d9efdb6eeb 100644 --- a/data/crac/crac-io/crac-io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java +++ b/data/crac/crac-io/crac-io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java @@ -18,8 +18,8 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/data/crac/crac-io/crac-io-commons/pom.xml b/data/crac/crac-io/crac-io-commons/pom.xml index 511f060ea6..e551761d63 100644 --- a/data/crac/crac-io/crac-io-commons/pom.xml +++ b/data/crac/crac-io/crac-io-commons/pom.xml @@ -61,7 +61,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-io/crac-io-csa-profiles/pom.xml b/data/crac/crac-io/crac-io-csa-profiles/pom.xml index 9e54c73ca1..ebf9474343 100644 --- a/data/crac/crac-io/crac-io-csa-profiles/pom.xml +++ b/data/crac/crac-io/crac-io-csa-profiles/pom.xml @@ -24,20 +24,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin @@ -93,7 +81,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-io/crac-io-cse/pom.xml b/data/crac/crac-io/crac-io-cse/pom.xml index e20e9dc0e8..a8f07cb210 100644 --- a/data/crac/crac-io/crac-io-cse/pom.xml +++ b/data/crac/crac-io/crac-io-cse/pom.xml @@ -24,19 +24,9 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - com.powsybl.openrao.data.cracio.cse.xsd src/main/resources/com/powsybl/openrao/data/cracio/cse/xsd @@ -63,8 +53,8 @@ ${project.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api @@ -108,7 +98,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java b/data/crac/crac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java index 48a00bffd7..f0f0f9bfce 100644 --- a/data/crac/crac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java +++ b/data/crac/crac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java @@ -18,8 +18,8 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/data/crac/crac-io/crac-io-fb-constraint/pom.xml b/data/crac/crac-io/crac-io-fb-constraint/pom.xml index 02dae60a48..76d0c43410 100644 --- a/data/crac/crac-io/crac-io-fb-constraint/pom.xml +++ b/data/crac/crac-io/crac-io-fb-constraint/pom.xml @@ -24,23 +24,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - true - - -Xinheritance - -Xcopyable - -Xequals - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins @@ -69,12 +54,8 @@ powsybl-iidm-api - javax.xml.bind - jaxb-api - - - org.jvnet.jaxb2_commons - jaxb2-basics + jakarta.xml.bind + jakarta.xml.bind-api @@ -119,7 +100,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java b/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java index 135a5609d8..0013bda1c7 100644 --- a/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java +++ b/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java @@ -21,7 +21,7 @@ import com.powsybl.openrao.data.cracio.commons.ucte.UctePstHelper; import com.powsybl.openrao.data.cracio.commons.ucte.UcteTopologicalElementHelper; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java b/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java index 2ccb471713..773207287f 100644 --- a/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java +++ b/data/crac/crac-io/crac-io-fb-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java @@ -19,9 +19,9 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/data/crac/crac-io/crac-io-json/pom.xml b/data/crac/crac-io/crac-io-json/pom.xml index 76e351bc24..f26531a010 100644 --- a/data/crac/crac-io/crac-io-json/pom.xml +++ b/data/crac/crac-io/crac-io-json/pom.xml @@ -61,7 +61,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/rao-result/rao-result-api/pom.xml b/data/rao-result/rao-result-api/pom.xml index 7656238ff2..c06afc8118 100644 --- a/data/rao-result/rao-result-api/pom.xml +++ b/data/rao-result/rao-result-api/pom.xml @@ -35,7 +35,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/rao-result/rao-result-json/pom.xml b/data/rao-result/rao-result-json/pom.xml index 2722fee3b3..04ed598e01 100644 --- a/data/rao-result/rao-result-json/pom.xml +++ b/data/rao-result/rao-result-json/pom.xml @@ -94,7 +94,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/refprog/refprog-xml-importer/pom.xml b/data/refprog/refprog-xml-importer/pom.xml index de90bc8665..18908bb9f9 100644 --- a/data/refprog/refprog-xml-importer/pom.xml +++ b/data/refprog/refprog-xml-importer/pom.xml @@ -17,20 +17,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin @@ -42,8 +30,8 @@ ${project.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/data/refprog/refprog-xml-importer/src/main/java/com/powsybl/openrao/data/refprog/refprogxmlimporter/RefProgImporter.java b/data/refprog/refprog-xml-importer/src/main/java/com/powsybl/openrao/data/refprog/refprogxmlimporter/RefProgImporter.java index c5352e2b63..11fd1fe84b 100644 --- a/data/refprog/refprog-xml-importer/src/main/java/com/powsybl/openrao/data/refprog/refprogxmlimporter/RefProgImporter.java +++ b/data/refprog/refprog-xml-importer/src/main/java/com/powsybl/openrao/data/refprog/refprogxmlimporter/RefProgImporter.java @@ -11,9 +11,9 @@ import com.powsybl.openrao.data.refprog.referenceprogram.ReferenceExchangeData; import com.powsybl.openrao.data.refprog.referenceprogram.ReferenceProgram; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/data/result-exporter/cne-exporter-commons/pom.xml b/data/result-exporter/cne-exporter-commons/pom.xml index c9e3b51230..2766ef47b9 100644 --- a/data/result-exporter/cne-exporter-commons/pom.xml +++ b/data/result-exporter/cne-exporter-commons/pom.xml @@ -24,20 +24,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins @@ -107,7 +95,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/result-exporter/core-cne-exporter/pom.xml b/data/result-exporter/core-cne-exporter/pom.xml index 17f48c8936..de7224c46c 100644 --- a/data/result-exporter/core-cne-exporter/pom.xml +++ b/data/result-exporter/core-cne-exporter/pom.xml @@ -24,20 +24,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins @@ -86,8 +74,8 @@ powsybl-iidm-api - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api @@ -132,7 +120,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/result-exporter/core-cne-exporter/src/main/java/com/powsybl/openrao/data/corecneexporter/CoreCneExporter.java b/data/result-exporter/core-cne-exporter/src/main/java/com/powsybl/openrao/data/corecneexporter/CoreCneExporter.java index 850450db47..62ef7ff9b0 100644 --- a/data/result-exporter/core-cne-exporter/src/main/java/com/powsybl/openrao/data/corecneexporter/CoreCneExporter.java +++ b/data/result-exporter/core-cne-exporter/src/main/java/com/powsybl/openrao/data/corecneexporter/CoreCneExporter.java @@ -20,10 +20,10 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; diff --git a/data/result-exporter/core-cne-exporter/src/main/resources/xjb/binding.xjb b/data/result-exporter/core-cne-exporter/src/main/resources/xjb/binding.xjb index d581ae123e..76899f4461 100644 --- a/data/result-exporter/core-cne-exporter/src/main/resources/xjb/binding.xjb +++ b/data/result-exporter/core-cne-exporter/src/main/resources/xjb/binding.xjb @@ -11,7 +11,7 @@ diff --git a/data/result-exporter/swe-cne-exporter/pom.xml b/data/result-exporter/swe-cne-exporter/pom.xml index cc55202b22..6bfecc17d5 100644 --- a/data/result-exporter/swe-cne-exporter/pom.xml +++ b/data/result-exporter/swe-cne-exporter/pom.xml @@ -24,20 +24,8 @@ - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - -Xinheritance - - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - + org.jvnet.jaxb + jaxb-maven-plugin org.apache.maven.plugins @@ -91,8 +79,8 @@ powsybl-iidm-api - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api @@ -131,7 +119,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/data/result-exporter/swe-cne-exporter/src/main/java/com/powsybl/openrao/data/swecneexporter/SweCneExporter.java b/data/result-exporter/swe-cne-exporter/src/main/java/com/powsybl/openrao/data/swecneexporter/SweCneExporter.java index d051741e8f..d0290cd30f 100644 --- a/data/result-exporter/swe-cne-exporter/src/main/java/com/powsybl/openrao/data/swecneexporter/SweCneExporter.java +++ b/data/result-exporter/swe-cne-exporter/src/main/java/com/powsybl/openrao/data/swecneexporter/SweCneExporter.java @@ -20,10 +20,10 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; diff --git a/data/result-exporter/swe-cne-exporter/src/main/resources/xjb/binding.xjb b/data/result-exporter/swe-cne-exporter/src/main/resources/xjb/binding.xjb index fd67cf55a3..2e797d8c3d 100644 --- a/data/result-exporter/swe-cne-exporter/src/main/resources/xjb/binding.xjb +++ b/data/result-exporter/swe-cne-exporter/src/main/resources/xjb/binding.xjb @@ -11,7 +11,7 @@ diff --git a/flowbased-computation/flowbased-computation-api/pom.xml b/flowbased-computation/flowbased-computation-api/pom.xml index 506a004433..1cef4376b8 100755 --- a/flowbased-computation/flowbased-computation-api/pom.xml +++ b/flowbased-computation/flowbased-computation-api/pom.xml @@ -108,7 +108,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/flowbased-computation/flowbased-computation-impl/pom.xml b/flowbased-computation/flowbased-computation-impl/pom.xml index 4c1c79f55d..60e5e9535e 100644 --- a/flowbased-computation/flowbased-computation-impl/pom.xml +++ b/flowbased-computation/flowbased-computation-impl/pom.xml @@ -89,7 +89,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/loopflow-computation/pom.xml b/loopflow-computation/pom.xml index cb6ffa169b..30b7b91e3d 100644 --- a/loopflow-computation/pom.xml +++ b/loopflow-computation/pom.xml @@ -105,7 +105,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/monitoring/pom.xml b/monitoring/pom.xml index a154671a5c..ea14c30017 100644 --- a/monitoring/pom.xml +++ b/monitoring/pom.xml @@ -99,7 +99,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/pom.xml b/pom.xml index a89fe4eb94..574eae7bd8 100644 --- a/pom.xml +++ b/pom.xml @@ -88,38 +88,36 @@ 3.13.0 - 7.15.0 + 7.20.1 2.16.1 1.1.1 - 32.0.0-jre + 33.2.1-jre 9.11.4210 - 2.15.2 + 2.17.1 2.0.1.Final - 2.3.2 - 2.4.0-b180830.0359 - 2.4.0-b180830.0438 - 1.1 - 5.10.0 - 5.10.0 - 1.2.13 + 4.0.2 + 4.0.5 + 1.3.0 + 5.11.3 + 5.10.2 + 1.5.6 1.18.28 - 1.4 - 3.8.1 - 3.2.0 - 2.8.2 - 3.0.1 - 0.8.8 - 3.2.0 - 3.2.0 - 0.15.3 - 1.11.1 - 3.2.1 - 1.0.0 - 5.2.0 + 3.2.1 + 3.11.0 + 3.6.0 + 3.1.1 + 3.1.0 + 0.8.12 + 3.3.0 + 3.10.1 + 4.0.8 + 3.3.1 + 3.0.0 + 5.12.0 6.5.0 2.11.0 1.13.1 - 1.7.36 + 2.0.13 2.10.0 1.5.3 @@ -128,15 +126,9 @@ - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - ${maven.jaxb2.version} + org.jvnet.jaxb + jaxb-maven-plugin + ${maven.jvnet.jaxb.version} @@ -324,16 +316,6 @@ validation-api ${javax.validation.version} - - javax.xml.bind - jaxb-api - ${jaxb-api.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics - ${maven.jvnet.jaxb2-basics.version} - org.slf4j slf4j-api @@ -438,8 +420,8 @@ org.mockito - mockito-inline - ${mockito.inline.version} + mockito-core + ${mockito.core.version} test diff --git a/ra-optimisation/rao-api/pom.xml b/ra-optimisation/rao-api/pom.xml index d7489f0c91..d7e521e43a 100644 --- a/ra-optimisation/rao-api/pom.xml +++ b/ra-optimisation/rao-api/pom.xml @@ -107,7 +107,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/ra-optimisation/search-tree-rao/pom.xml b/ra-optimisation/search-tree-rao/pom.xml index 6f4fb79bd6..a04e6c7667 100644 --- a/ra-optimisation/search-tree-rao/pom.xml +++ b/ra-optimisation/search-tree-rao/pom.xml @@ -105,7 +105,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/sensitivity-analysis/pom.xml b/sensitivity-analysis/pom.xml index f552e89bb2..7be4d264e7 100644 --- a/sensitivity-analysis/pom.xml +++ b/sensitivity-analysis/pom.xml @@ -92,7 +92,7 @@ org.mockito - mockito-inline + mockito-core test diff --git a/tests/pom.xml b/tests/pom.xml index 0a746f90af..06e6689ad5 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -264,11 +264,6 @@ org.everit.json.schema ${org.everit.json.version} --> - - org.jvnet.jaxb2_commons - jaxb2-basics - test - org.xmlunit xmlunit-core diff --git a/util/pom.xml b/util/pom.xml index 85f738b33f..436499c819 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -57,7 +57,7 @@ org.mockito - mockito-inline + mockito-core test