diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index b89fda9..58204bb 100644 --- a/.github/workflows/reuse.yml +++ b/.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 diff --git a/commons/pom.xml b/commons/pom.xml index f08f4e9..2782f89 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -49,7 +49,7 @@ SPDX-License-Identifier: Apache-2.0 org.glassfish.jaxb jaxb-runtime provided - 4.0.4 + 4.0.5 diff --git a/pom.xml b/pom.xml index 628fda4..ad067d2 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 0.0.4 - 3.7.4 - 2.23.0 + 3.9.2 + 2.23.1 0.9.1 @@ -139,7 +139,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 @@ -157,7 +157,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources @@ -197,7 +197,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.11 + 0.8.12 jacoco diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index 053c932..f5290af 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/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 @@ -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 @@ -266,6 +278,7 @@ SPDX-License-Identifier: Apache-2.0 + diff --git a/scl2003/pom.xml b/scl2003/pom.xml index d070e17..4159ac8 100644 --- a/scl2003/pom.xml +++ b/scl2003/pom.xml @@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0 org.glassfish.jaxb jaxb-runtime provided - 4.0.4 + 4.0.5 diff --git a/scl2007b/pom.xml b/scl2007b/pom.xml index 9bfcdfe..87f8b1a 100644 --- a/scl2007b/pom.xml +++ b/scl2007b/pom.xml @@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0 org.glassfish.jaxb jaxb-runtime provided - 4.0.4 + 4.0.5 diff --git a/scl2007b4/pom.xml b/scl2007b4/pom.xml index 3a23490..e8982ba 100644 --- a/scl2007b4/pom.xml +++ b/scl2007b4/pom.xml @@ -41,7 +41,7 @@ SPDX-License-Identifier: Apache-2.0 org.glassfish.jaxb jaxb-runtime provided - 4.0.4 + 4.0.5 diff --git a/websocket-commons/pom.xml b/websocket-commons/pom.xml index 3f8d5ae..3063390 100644 --- a/websocket-commons/pom.xml +++ b/websocket-commons/pom.xml @@ -40,7 +40,7 @@ SPDX-License-Identifier: Apache-2.0 org.glassfish.jaxb jaxb-runtime provided - 4.0.4 + 4.0.5