Skip to content

Commit

Permalink
Merge branch 'main' into swe_cne_threshold_decimals
Browse files Browse the repository at this point in the history
  • Loading branch information
@phiedw
phiedw authored Dec 19, 2024
2 parents 8047b54 + 8663132 commit 7f97e75
Show file tree
Hide file tree
Showing 8 changed files with 127 additions and 9 deletions.
18 changes: 18 additions & 0 deletions data/crac/crac-io/crac-io-cim/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<configuration>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -73,6 +86,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
9 changes: 0 additions & 9 deletions data/crac/crac-io/crac-io-csa-profiles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@
<description>CRAC creator implementation for CRAC specific to CSA profiles</description>
<packaging>jar</packaging>

<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
16 changes: 16 additions & 0 deletions data/crac/crac-io/crac-io-cse/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@
<configuration>
<generatePackage>com.powsybl.openrao.data.crac.io.cse.xsd</generatePackage>
<schemaDirectory>src/main/resources/com/powsybl/openrao/data/crac/io/cse/xsd</schemaDirectory>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -69,6 +80,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
21 changes: 21 additions & 0 deletions data/crac/crac-io/crac-io-fb-constraint/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
<configuration>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
<arg>-Xcopyable</arg>
<arg>-Xequals</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -64,6 +80,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
18 changes: 18 additions & 0 deletions data/rao-result/rao-result-io/rao-result-cne/cne-exporter-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<configuration>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -65,6 +78,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
18 changes: 18 additions & 0 deletions data/rao-result/rao-result-io/rao-result-cne/core-cne-exporter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<configuration>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -84,6 +97,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
18 changes: 18 additions & 0 deletions data/rao-result/rao-result-io/rao-result-cne/swe-cne-exporter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<configuration>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -89,6 +102,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
18 changes: 18 additions & 0 deletions data/refprog/refprog-xml-importer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,19 @@
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<configuration>
<extension>true</extension>
<args>
<arg>-Xinheritance</arg>
</args>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>
</build>
Expand All @@ -40,6 +53,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${maven.jvnet.jaxb.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down

0 comments on commit 7f97e75

Please sign in to comment.