Merge pull request #355 from com-pas/develop

Update Main

Author: massifben

.github/workflows/reuse.yml

@@ -13,4 +13,4 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v2
+        uses: fsfe/reuse-action@v3

commons/pom.xml

@@ -49,7 +49,7 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
-            <version>4.0.4</version>
+            <version>4.0.5</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -17,8 +17,8 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
-        <quarkus.platform.version>3.7.4</quarkus.platform.version>
-        <log4j2.version>2.23.0</log4j2.version>
+        <quarkus.platform.version>3.9.2</quarkus.platform.version>
+        <log4j2.version>2.23.1</log4j2.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
 
@@ -139,7 +139,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.12.1</version>
+                    <version>3.13.0</version>
                 </plugin>
 
                 <plugin>
@@ -157,7 +157,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.1</version>
                     <executions>
                         <execution>
                             <id>attach-sources</id>
@@ -197,7 +197,7 @@ SPDX-License-Identifier: Apache-2.0
                 <sonar.language>java</sonar.language>
 
                 <!-- JaCoCo Properties -->
-                <jacoco.version>0.8.11</jacoco.version>
+                <jacoco.version>0.8.12</jacoco.version>
                 <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
             </properties>
 

scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd

@@ -19,6 +19,7 @@ SPDX-License-Identifier: Apache-2.0
             Version 1.5 Release 2023/04/05
             Version 1.6 Release 2023/12/06
             Version 1.7 Release 2024/02/07
+            Version 1.8 Release 2024/05/16
         </xs:documentation>
     </xs:annotation>
 
@@ -250,6 +251,17 @@ SPDX-License-Identifier: Apache-2.0
                 BusBar1 --BF1---BF2-----||--BF3---BF4--------_----BF5------
                 BusBar2 --BF7---BF8-----||--BF9---BF10-------_----BF11-----
 
+                Example values :
+                FlowSourceVoltageLevel -> HT or THT or voltageLevel.name (3, 4, 5, 6 or 7)
+                FlowSourceIEDType -> BCU, SCU-LIGNE, SCU-TG, TOPO....
+                FlowSourceBayKind -> Bay Kind of the Bay (CB, TR, LI, TG, AP...) same meaning as Bay@BayCodif of the Compas:Bay node
+                FlowSourceBayNum -> BayNum of the bay same meaning as Bay@NumBay of the Compas:Bay node
+                FlowSourceBayNode -> BayNum of the bay same meaning as Bay@NumBay of the Compas:Topo@Node attribute
+                FlowSourceBayNodeOrder -> There are multiple cases
+                Case 1 FlowSourceBayKind +AND+ FlowSourceBayNum have values (not empty); the source IED is searched within a unique bay defined by bay attributes
+                Case 2 FlowSourceBayNode +AND+ FlowSourceBayNodeOrder have values (not empty); the source IED is searched within a unique bay defined by bay attributes
+                Case (1 +OR+ 2) AND (FlowSourceIEDType (not empty) +OR + FlowSourceIEDredundancy (not empty) +OR+ FlowIEDSystemVersioninstance (not empty)); the source IED is searched within a predefined bay and for given IED attributes
+                Case 3 FlowSourceIEDType (not empty) +OR + FlowSourceIEDredundancy (not empty) +OR+ FlowIEDSystemVersioninstance (not empty); the source IED is searched for a given and unique bay and for given IED attributs
             </xs:documentation>
         </xs:annotation>
         <xs:attribute name="dataStreamKey" type="xs:string" use="optional"/>
@@ -266,6 +278,7 @@ SPDX-License-Identifier: Apache-2.0
         <xs:attribute name="FlowSourceBayNode" type="xs:integer" use="optional"/>
         <xs:attribute name="FlowSourceBayNodeOrder" type="xs:integer" use="optional"/>
         <xs:attribute name="FlowSourceNumBayBusBarSectionOrder" type="xs:integer" use="optional"/>
+        <xs:attribute name="FlowIEDSystemVersioninstance" type="xs:integer" use="optional"/>
         <xs:attribute name="FlowID" type="xs:string" use="optional"/>
         <xs:attribute name="FlowStatus" type="tCompasFlowStatus" use="optional"/>
         <xs:attribute name="FlowKind" type="tCompasFlowKind" use="optional"/>

scl2003/pom.xml

@@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
-            <version>4.0.4</version>
+            <version>4.0.5</version>
         </dependency>
 
         <dependency>

scl2007b/pom.xml

@@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
-            <version>4.0.4</version>
+            <version>4.0.5</version>
         </dependency>
 
         <dependency>

scl2007b4/pom.xml

@@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
-            <version>4.0.4</version>
+            <version>4.0.5</version>
         </dependency>
 
         <dependency>

websocket-commons/pom.xml

@@ -40,7 +40,7 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
-            <version>4.0.4</version>
+            <version>4.0.5</version>
         </dependency>
 
         <dependency>