Skip to content

Commit 617913c

Browse files
pascalwilbrinkpascalwilbrink
authored
Merge pull request #221 from com-pas/develop
Created Release
2 parents 01e814b + 1fd748e commit 617913c

File tree

4 files changed

+54
-45
lines changed

4 files changed

+54
-45
lines changed

‎.github/workflows/automate-projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
steps:
1515
- name: add-new-issues-to-organization-based-project-column
1616
if: github.event_name == 'issues' && github.event.action == 'opened'
17-
uses: alex-page/[email protected].2
17+
uses: alex-page/[email protected].3
1818
with:
1919
project: CoMPAS Issues Overview Board
2020
column: To do
2121
repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
2222
- name: add-new-pull-request-to-organization-based-project-column
2323
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
24-
uses: alex-page/[email protected].2
24+
uses: alex-page/[email protected].3
2525
with:
2626
project: CoMPAS Pull Request Overview Board
2727
column: To do

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ SPDX-License-Identifier: Apache-2.0
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020

2121
<compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
22-
<quarkus.platform.version>2.14.1.Final</quarkus.platform.version>
23-
<jaxb.bind.version>2.3.7</jaxb.bind.version>
24-
<log4j2.version>2.19.0</log4j2.version>
22+
<quarkus.platform.version>2.16.3.Final</quarkus.platform.version>
23+
<jaxb.bind.version>2.3.8</jaxb.bind.version>
24+
<log4j2.version>2.20.0</log4j2.version>
2525
<openpojo.version>0.9.1</openpojo.version>
2626
</properties>
2727

@@ -115,13 +115,13 @@ SPDX-License-Identifier: Apache-2.0
115115
<plugin>
116116
<groupId>org.apache.maven.plugins</groupId>
117117
<artifactId>maven-dependency-plugin</artifactId>
118-
<version>3.3.0</version>
118+
<version>3.5.0</version>
119119
</plugin>
120120

121121
<plugin>
122122
<groupId>org.jvnet.jaxb2.maven2</groupId>
123123
<artifactId>maven-jaxb2-plugin</artifactId>
124-
<version>0.15.1</version>
124+
<version>0.15.2</version>
125125
<dependencies>
126126
<dependency>
127127
<groupId>org.jvnet.jaxb2_commons</groupId>
@@ -180,7 +180,7 @@ SPDX-License-Identifier: Apache-2.0
180180
<plugin>
181181
<groupId>org.apache.maven.plugins</groupId>
182182
<artifactId>maven-javadoc-plugin</artifactId>
183-
<version>3.4.1</version>
183+
<version>3.5.0</version>
184184
<executions>
185185
<execution>
186186
<id>attach-javadocs</id>

‎scl-extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ SPDX-License-Identifier: Apache-2.0
5555
<plugin>
5656
<groupId>org.jvnet.jaxb2.maven2</groupId>
5757
<artifactId>maven-jaxb2-plugin</artifactId>
58-
<version>0.15.1</version>
58+
<version>0.15.2</version>
5959
<executions>
6060
<execution>
6161
<id>xjc</id>

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

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ SPDX-License-Identifier: Apache-2.0
1515
Version 1.1 Release 2022/01/21
1616
Version 1.2 Release 2022/06/08
1717
Version 1.3 Release 2022/09/08
18+
Version 1.4 Release 2023/02/28
1819
</xs:documentation>
1920
</xs:annotation>
2021

@@ -100,36 +101,36 @@ SPDX-License-Identifier: Apache-2.0
100101
</xs:sequence>
101102
</xs:complexType>
102103

103-
<xs:simpleType name="tCompasIEDType">
104+
<xs:simpleType name="tCompasIEDType">
104105
<xs:annotation>
105106
<xs:documentation xml:lang="en">
106107
IED type to be used to identity the set of LDevice.inst handled by the IED
107108
</xs:documentation>
108109
</xs:annotation>
109110
<xs:restriction base="xs:string">
110-
<xs:enumeration value="SCU"/>
111-
<xs:enumeration value="SCU-MCB"/>
112-
<xs:enumeration value="SCU-TG"/>
113-
<xs:enumeration value="SCU-ORG"/>
114-
<xs:enumeration value="BCU"/>
115-
<xs:enumeration value="BCU-LIGNE"/>
116-
<xs:enumeration value="BCU-CBO"/>
117-
<xs:enumeration value="BPU"/>
118-
<xs:enumeration value="MU"/>
119-
<xs:enumeration value="SAMU"/>
120-
<xs:enumeration value="PROT"/>
121-
<xs:enumeration value="TAC"/>
122-
<xs:enumeration value="PX"/>
123-
<xs:enumeration value="PDIS"/>
124-
<xs:enumeration value="PDB"/>
125-
<xs:enumeration value="AUT"/>
126-
<xs:enumeration value="PDIF"/>
127-
<xs:enumeration value="GRP"/>
128-
<xs:enumeration value="GW"/>
129-
<xs:enumeration value="TG"/>
130-
<xs:enumeration value="TOPO"/>
131-
<xs:enumeration value="ADEFINIR"/>
132-
<xs:enumeration value="IEDTEST"/>
111+
<xs:enumeration value="SCU"/>
112+
<xs:enumeration value="SCU-MCB"/>
113+
<xs:enumeration value="SCU-TG"/>
114+
<xs:enumeration value="SCU-ORG"/>
115+
<xs:enumeration value="BCU"/>
116+
<xs:enumeration value="BCU-LIGNE"/>
117+
<xs:enumeration value="BCU-CBO"/>
118+
<xs:enumeration value="BPU"/>
119+
<xs:enumeration value="MU"/>
120+
<xs:enumeration value="SAMU"/>
121+
<xs:enumeration value="PROT"/>
122+
<xs:enumeration value="TAC"/>
123+
<xs:enumeration value="PX"/>
124+
<xs:enumeration value="PDIS"/>
125+
<xs:enumeration value="PDB"/>
126+
<xs:enumeration value="AUT"/>
127+
<xs:enumeration value="PDIF"/>
128+
<xs:enumeration value="GRP"/>
129+
<xs:enumeration value="GW"/>
130+
<xs:enumeration value="TG"/>
131+
<xs:enumeration value="TOPO"/>
132+
<xs:enumeration value="ADEFINIR"/>
133+
<xs:enumeration value="IEDTEST"/>
133134
</xs:restriction>
134135
</xs:simpleType>
135136

@@ -194,6 +195,7 @@ SPDX-License-Identifier: Apache-2.0
194195
<xs:restriction base="xs:string">
195196
<xs:enumeration value="Up"/>
196197
<xs:enumeration value="Down"/>
198+
<xs:enumeration value="N/A"/>
197199
</xs:restriction>
198200
</xs:simpleType>
199201

@@ -238,13 +240,19 @@ SPDX-License-Identifier: Apache-2.0
238240
<xs:complexType name="tCompasICDHeader" mixed="true">
239241
<xs:annotation>
240242
<xs:documentation xml:lang="en">
241-
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.
243+
Define specific Compas attributes to identify uniquely one IED with-in a SystemVersion for a given ICD, IEDredundancy, IEDSystemVersionInstance
244+
The IEDType defines the set of LD which are supported by the hardware
245+
The VendorName, IEDmodel, hwRev, swRev, headerId, headerVersion, headerRevision are issued from the ICD file
246+
The UUID of this combination is defined by the ICDSystemVersionUUID.
242247
This private is intended to be used in the STD file (/IED level) and SSD (/LNode level)
248+
At LNode level it defines the link between the Function, the associated LD, LN and the implementation in a given IED
249+
At IED level, it defines the link of the IED within the SystemVersion
243250
</xs:documentation>
244251
</xs:annotation>
245252
<xs:attribute name="ICDSystemVersionUUID" type="xs:string" use="optional"/>
246253
<xs:attribute name="IEDType" type="tCompasIEDType" use="required"/>
247-
<xs:attribute name="IEDinstance" type="xs:string" use="optional"/>
254+
<xs:attribute name="IEDSubstationinstance" type="xs:integer" use="optional"/>
255+
<xs:attribute name="IEDSystemVersioninstance" type="xs:integer" use="optional"/>
248256
<xs:attribute name="IEDName" type="xs:string" use="optional"/>
249257
<xs:attribute name="VendorName" type="xs:string" use="required"/>
250258
<xs:attribute name="IEDmodel" type="xs:string" use="required"/>
@@ -261,6 +269,8 @@ SPDX-License-Identifier: Apache-2.0
261269
<xs:annotation>
262270
<xs:documentation xml:lang="en">
263271
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.
272+
The MainSystemVersion refers to a set of functional requirements and functions
273+
The MinorSystemVersion is linked to a given bayKind and defines uniquely the set of ICD which are qualified
264274
</xs:documentation>
265275
</xs:annotation>
266276
<xs:attribute name="MainSystemVersion" type="xs:string" use="optional"/>
@@ -298,21 +308,20 @@ SPDX-License-Identifier: Apache-2.0
298308
</xs:complexType>
299309

300310
<xs:complexType name="tCompasTopo">
301-
<xs:annotation>
302-
<xs:documentation xml:lang="en">
303-
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
304-
</xs:documentation>
305-
</xs:annotation>
306-
<xs:attribute name="Node" type="xs:string" use="required"/>
307-
<xs:attribute name="NodeOrder" type="xs:integer" use="required"/>
308-
<xs:attribute name="BusBarSectionOrder" type="xs:integer" use="optional"/>
309-
<xs:attribute name="Direction" type="tCompasTopoNodeDirection" use="required"/>
311+
<xs:annotation>
312+
<xs:documentation xml:lang="en">
313+
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
314+
</xs:documentation>
315+
</xs:annotation>
316+
<xs:attribute name="Node" type="xs:string" use="required"/>
317+
<xs:attribute name="NodeOrder" type="xs:integer" use="required"/>
318+
<xs:attribute name="BusBarSectionOrder" type="xs:integer" use="optional"/>
319+
<xs:attribute name="Direction" type="tCompasTopoNodeDirection" use="required"/>
310320
</xs:complexType>
311321

312322
<xs:element name="SclName" type="tCompasSclName"/>
313323
<xs:element name="SclFileType" type="tCompasSclFileType"/>
314324
<xs:element name="Labels" type="tCompasLabels"/>
315-
316325
<xs:element name="Flow" type="tCompasFlow"/>
317326
<xs:element name="Bay" type="tCompasBay"/>
318327
<xs:element name="LDevice" type="tCompasLDevice"/>

0 commit comments

Comments
 (0)