Merge pull request #292 from com-pas/develop

Develop to Main
com-pas · Jun 19, 2023 · 1fa7bc8 · 1fa7bc8
2 parents fe12ba7 + c1ac3b7
commit 1fa7bc8
Show file tree

Hide file tree

Showing 61 changed files with 3,830 additions and 1,726 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,25 +36,18 @@
         <sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
         <aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
         <sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-        <compas-core.version>0.14.0</compas-core.version>
+        <compas-core.version>0.15.0</compas-core.version>
         <compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
         <maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <junit-version>5.9.0</junit-version>
         <logback-classic.version>1.4.5</logback-classic.version>
         <assertj.version>3.22.0</assertj.version>
         <lombok.version>1.18.24</lombok.version>
+        <jackson-databind.version>2.13.4.1</jackson-databind.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.lfenergy.compas.core</groupId>
-            <artifactId>scl2007b4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.lfenergy.compas.core</groupId>
-            <artifactId>scl-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -85,11 +78,6 @@
                 <version>${junit-version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.lfenergy.compas.core</groupId>
-                <artifactId>scl2007b4</artifactId>
-                <version>${compas-core.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.lfenergy.compas.core</groupId>
                 <artifactId>scl-extension</artifactId>
@@ -110,6 +98,11 @@
                 <artifactId>assertj-core</artifactId>
                 <version>${assertj.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson-databind.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <modules>
@@ -122,16 +115,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.lfenergy.compas.xsd</groupId>
-                    <artifactId>compas-scl-xsd</artifactId>
-                    <version>${compas-scl-xsd.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.lfenergy.compas.core</groupId>
-                    <artifactId>scl-extension</artifactId>
-                    <version>${compas-core.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>

diff --git a/sct-commons/pom.xml b/sct-commons/pom.xml
@@ -35,6 +35,10 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -170,7 +174,7 @@
                                     <artifactId>scl-extension</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -189,8 +193,8 @@
                 </executions>
                 <configuration>
                     <sources>
-                        <source>${project.build.directory}/xsd/SCL2007B4/SCL.xsd</source>
-                        <source>${project.build.directory}/xsd/SCL_CoMPAS.xsd</source>
+                        <source>${project.build.outputDirectory}/xsd/SCL2007B4/SCL.xsd</source>
+                        <source>${project.build.outputDirectory}/xsd/SCL_CoMPAS.xsd</source>
                     </sources>
                     <xjbSources>
                         <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/scl2007b4/model/package-info.java b/sct-commons/src/main/java/org/lfenergy/compas/scl2007b4/model/package-info.java
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2023 RTE FRANCE
+//
+// SPDX-License-Identifier: Apache-2.0
+
+@XmlSchema(
+        namespace = "http://www.iec.ch/61850/2003/SCL",
+        xmlns = {
+                @XmlNs(namespaceURI = "http://www.iec.ch/61850/2003/SCL", prefix = ""),
+                @XmlNs(namespaceURI = "https://www.lfenergy.org/compas/extension/v1", prefix = "compas")
+        },
+        elementFormDefault = XmlNsForm.QUALIFIED)
+
+
+package org.lfenergy.compas.scl2007b4.model;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlSchema;
+
+/* This file is used by the Marshaller to set prefix "compas" for Compas Privates when marshalling JAXB objects */