Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Main #355

Merged
merged 22 commits into from
May 27, 2024
Merged

Update Main #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
99142c2
chore(deps): Bump fsfe/reuse-action from 2 to 3
dependabot[bot] Feb 27, 2024
6430dca
chore(deps): Bump org.glassfish.jaxb:jaxb-runtime from 4.0.4 to 4.0.5
dependabot[bot] Mar 7, 2024
121fdb8
chore(deps): Bump io.quarkus.platform:quarkus-bom from 3.7.4 to 3.8.2
dependabot[bot] Mar 8, 2024
a633cbc
Merge pull request #332 from com-pas/dependabot/github_actions/fsfe/r…
Stef3st Mar 10, 2024
2e0b239
Merge branch 'develop' into dependabot/maven/org.glassfish.jaxb-jaxb-…
Stef3st Mar 10, 2024
27a3682
Merge pull request #335 from com-pas/dependabot/maven/org.glassfish.j…
Stef3st Mar 10, 2024
0971cd0
Merge branch 'develop' into dependabot/maven/io.quarkus.platform-quar…
Stef3st Mar 10, 2024
ffe4d73
Merge pull request #336 from com-pas/dependabot/maven/io.quarkus.plat…
Stef3st Mar 10, 2024
42132e8
chore(deps): Bump log4j2.version from 2.23.0 to 2.23.1
dependabot[bot] Mar 11, 2024
d22304e
Merge pull request #337 from com-pas/dependabot/maven/log4j2.version-…
Stef3st Apr 5, 2024
ebdcda3
chore(deps): Bump org.apache.maven.plugins:maven-compiler-plugin
dependabot[bot] Apr 5, 2024
0234977
chore(deps): Bump io.quarkus.platform:quarkus-bom from 3.8.2 to 3.9.2
dependabot[bot] Apr 5, 2024
e89e106
Merge pull request #338 from com-pas/dependabot/maven/org.apache.mave…
Stef3st Apr 5, 2024
0c9ab8a
chore(deps): Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12
dependabot[bot] Apr 5, 2024
5f53f3c
Merge branch 'develop' into dependabot/maven/io.quarkus.platform-quar…
Stef3st Apr 5, 2024
f315463
Merge pull request #341 from com-pas/dependabot/maven/io.quarkus.plat…
Stef3st Apr 5, 2024
d5bb213
Merge branch 'develop' into dependabot/maven/org.jacoco-jacoco-maven-…
Stef3st Apr 5, 2024
da6eb1b
Merge pull request #342 from com-pas/dependabot/maven/org.jacoco-jaco…
Stef3st Apr 5, 2024
a4b456e
chore(deps): Bump org.apache.maven.plugins:maven-source-plugin
dependabot[bot] Apr 5, 2024
615b576
Merge pull request #343 from com-pas/dependabot/maven/org.apache.mave…
juancho0202 Apr 18, 2024
97dd3b0
feat(352): update SCL_COMPAS.xsd file - add attribute FlowIEDSystemVe…
massifben May 17, 2024
6a4fd53
Merge pull request #353 from com-pas/feat/352-update-compas_scl_xsd
massifben May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/reuse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
13 changes: 13 additions & 0 deletions scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion scl2003/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion websocket-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading