Update pom (#1164)

* same version as powsybl core Signed-off-by: Godelaine de Montmorillon <[email protected]> * same as powsybl-core, powsybl-parent Signed-off-by: Godelaine de Montmorillon <[email protected]> * same as powsybl-core, powsybl-parent Signed-off-by: Godelaine de Montmorillon <[email protected]> * update dependencies from mvn central Signed-off-by: Godelaine de Montmorillon <[email protected]> * revert version runtime Signed-off-by: Godelaine de Montmorillon <[email protected]> * updated jaxb version to jakarta (4.0) (#1198) * updated jaxb version to jakarta (4.0) Signed-off-by: Philippe Edwards <[email protected]> * corrected indentation Signed-off-by: Philippe Edwards <[email protected]> --------- Signed-off-by: Philippe Edwards <[email protected]> --------- Signed-off-by: Godelaine de Montmorillon <[email protected]> Signed-off-by: Philippe Edwards <[email protected]> Co-authored-by: Thomas Bouquet <[email protected]> Co-authored-by: phiedw <[email protected]> Signed-off-by: Thomas Bouquet <[email protected]>
powsybl · Nov 26, 2024 · ee88dc7 · ee88dc7
1 parent 845d838
commit ee88dc7
Show file tree

Hide file tree

Showing 34 changed files with 98 additions and 222 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -112,7 +112,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/crac/crac-api/pom.xml b/data/crac/crac-api/pom.xml
@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/crac/crac-impl/pom.xml b/data/crac/crac-impl/pom.xml
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/crac/crac-io/crac-io-cim/pom.xml b/data/crac/crac-io/crac-io-cim/pom.xml
@@ -24,20 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -63,8 +51,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -125,7 +113,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...io-cim/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/CimCracImporter.java b/...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
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git 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 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -93,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/data/crac/crac-io/crac-io-cse/pom.xml b/data/crac/crac-io/crac-io-cse/pom.xml
@@ -24,19 +24,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
                 <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
                     <generatePackage>com.powsybl.openrao.data.cracio.cse.xsd</generatePackage>
                     <schemaDirectory>src/main/resources/com/powsybl/openrao/data/cracio/cse/xsd</schemaDirectory>
                 </configuration>
@@ -63,8 +53,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -108,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...rac-io/crac-io-cse/src/main/java/com/powsybl/openrao/data/cracio/cse/CseCracImporter.java b/...rac-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
@@ -24,23 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <extension>true</extension>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                        <arg>-Xcopyable</arg>
-                        <arg>-Xequals</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -69,12 +54,8 @@
             <artifactId>powsybl-iidm-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>jaxb2-basics</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -119,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...b-constraint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/ActionReader.java b/...b-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/...aint/src/main/java/com/powsybl/openrao/data/cracio/fbconstraint/FbConstraintImporter.java b/...aint/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
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/data/rao-result/rao-result-api/pom.xml b/data/rao-result/rao-result-api/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/rao-result/rao-result-json/pom.xml b/data/rao-result/rao-result-json/pom.xml
@@ -94,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/refprog/refprog-xml-importer/pom.xml b/data/refprog/refprog-xml-importer/pom.xml
@@ -17,20 +17,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -42,8 +30,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->

diff --git a/...er/src/main/java/com/powsybl/openrao/data/refprog/refprogxmlimporter/RefProgImporter.java b/...er/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
@@ -24,20 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -107,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/data/result-exporter/core-cne-exporter/pom.xml b/data/result-exporter/core-cne-exporter/pom.xml
@@ -24,20 +24,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    <args>
-                        <arg>-Xinheritance</arg>
-                    </args>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${maven.jvnet.jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </configuration>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -86,8 +74,8 @@
             <artifactId>powsybl-iidm-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
         <!-- Runtime dependencies -->
@@ -132,7 +120,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>