diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml index ec3166d..c907722 100644 --- a/.github/workflows/automate-projects.yml +++ b/.github/workflows/automate-projects.yml @@ -14,14 +14,14 @@ jobs: steps: - name: add-new-issues-to-organization-based-project-column if: github.event_name == 'issues' && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.8.2 + uses: alex-page/github-project-automation-plus@v0.8.3 with: project: CoMPAS Issues Overview Board column: To do repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }} - name: add-new-pull-request-to-organization-based-project-column if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.8.2 + uses: alex-page/github-project-automation-plus@v0.8.3 with: project: CoMPAS Pull Request Overview Board column: To do diff --git a/pom.xml b/pom.xml index c81e238..d3c2803 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 0.0.4 - 2.14.1.Final - 2.3.7 - 2.19.0 + 2.16.3.Final + 2.3.8 + 2.20.0 0.9.1 @@ -115,13 +115,13 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-dependency-plugin - 3.3.0 + 3.5.0 org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.15.1 + 0.15.2 org.jvnet.jaxb2_commons @@ -180,7 +180,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs diff --git a/scl-extension/pom.xml b/scl-extension/pom.xml index 44cf6c2..29a7b81 100644 --- a/scl-extension/pom.xml +++ b/scl-extension/pom.xml @@ -55,7 +55,7 @@ SPDX-License-Identifier: Apache-2.0 org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.15.1 + 0.15.2 xjc diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index eaf1343..85b781b 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -15,6 +15,7 @@ SPDX-License-Identifier: Apache-2.0 Version 1.1 Release 2022/01/21 Version 1.2 Release 2022/06/08 Version 1.3 Release 2022/09/08 + Version 1.4 Release 2023/02/28 @@ -100,36 +101,36 @@ SPDX-License-Identifier: Apache-2.0 - + IED type to be used to identity the set of LDevice.inst handled by the IED - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -194,6 +195,7 @@ SPDX-License-Identifier: Apache-2.0 + @@ -238,13 +240,19 @@ SPDX-License-Identifier: Apache-2.0 - Define specific Compas attributes to identify uniquely one ICD file with-in a SystemVersion for a given IEDredundancy. The UUID of this combinaison is defined by the ICDSystemVersionUUID. + Define specific Compas attributes to identify uniquely one IED with-in a SystemVersion for a given ICD, IEDredundancy, IEDSystemVersionInstance + The IEDType defines the set of LD which are supported by the hardware + The VendorName, IEDmodel, hwRev, swRev, headerId, headerVersion, headerRevision are issued from the ICD file + The UUID of this combination is defined by the ICDSystemVersionUUID. This private is intended to be used in the STD file (/IED level) and SSD (/LNode level) + At LNode level it defines the link between the Function, the associated LD, LN and the implementation in a given IED + At IED level, it defines the link of the IED within the SystemVersion - + + @@ -261,6 +269,8 @@ SPDX-License-Identifier: Apache-2.0 Identify the SystemVersion to which the functional Bay and IED belongs to. This Private can be used in /Bay in substation and in the /IED. + The MainSystemVersion refers to a set of functional requirements and functions + The MinorSystemVersion is linked to a given bayKind and defines uniquely the set of ICD which are qualified @@ -298,21 +308,20 @@ SPDX-License-Identifier: Apache-2.0 - - - Describe the connectivity node and layout order for a given Bay;can be multiple instanciated in case of bay which is connected to multiple nodes - - - - - - + + + Describe the connectivity node and layout order for a given Bay;can be multiple instanciated in case of bay which is connected to multiple nodes + + + + + + -