Skip to content

Commit 8fbf32b

Browse files
authored
Merge pull request #307 from com-pas/develop
Release 0.18.0
2 parents c508707 + 9f2a8cb commit 8fbf32b

File tree

7 files changed

+11
-7
lines changed

7 files changed

+11
-7
lines changed

.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v4
2525

2626
- name: Set up JDK 17
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'zulu'
3030
java-version: '17'

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
3636

3737
- name: Set up JDK 17
38-
uses: actions/setup-java@v3
38+
uses: actions/setup-java@v4
3939
if: ${{ steps.release.outputs.release_created }}
4040
with:
4141
distribution: 'zulu'

.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
2626

2727
- name: Set up JDK 17
28-
uses: actions/setup-java@v3
28+
uses: actions/setup-java@v4
2929
with:
3030
distribution: 'zulu'
3131
java-version: '17'

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
restore-keys: ${{ runner.os }}-m2
6868

6969
- name: Set up JDK 17
70-
uses: actions/setup-java@v3
70+
uses: actions/setup-java@v4
7171
with:
7272
distribution: 'zulu'
7373
java-version: '17'

.github/workflows/sonarcloud-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
restore-keys: ${{ runner.os }}-m2
4545

4646
- name: Set up JDK 17
47-
uses: actions/setup-java@v3
47+
uses: actions/setup-java@v4
4848
with:
4949
distribution: 'zulu'
5050
java-version: '17'

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SPDX-License-Identifier: Apache-2.0
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818

1919
<compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
20-
<quarkus.platform.version>3.5.3</quarkus.platform.version>
20+
<quarkus.platform.version>3.6.1</quarkus.platform.version>
2121
<log4j2.version>2.22.0</log4j2.version>
2222
<openpojo.version>0.9.1</openpojo.version>
2323
</properties>
@@ -171,7 +171,7 @@ SPDX-License-Identifier: Apache-2.0
171171
<plugin>
172172
<groupId>org.apache.maven.plugins</groupId>
173173
<artifactId>maven-javadoc-plugin</artifactId>
174-
<version>3.6.2</version>
174+
<version>3.6.3</version>
175175
<executions>
176176
<execution>
177177
<id>attach-javadocs</id>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ SPDX-License-Identifier: Apache-2.0
1717
Version 1.3 Release 2022/09/08
1818
Version 1.4 Release 2023/02/28
1919
Version 1.5 Release 2023/04/05
20+
Version 1.6 Release 2023/12/06
2021
</xs:documentation>
2122
</xs:annotation>
2223

@@ -126,6 +127,7 @@ SPDX-License-Identifier: Apache-2.0
126127
<xs:enumeration value="AUT"/>
127128
<xs:enumeration value="PDIF"/>
128129
<xs:enumeration value="GRP"/>
130+
<xs:enumeration value="ASLD"/>
129131
<xs:enumeration value="GW"/>
130132
<xs:enumeration value="TG"/>
131133
<xs:enumeration value="TOPO"/>
@@ -246,11 +248,13 @@ SPDX-License-Identifier: Apache-2.0
246248
<xs:attribute name="ExtRefprefix" type="xs:string" use="optional"/>
247249
<xs:attribute name="ExtReflnClass" type="xs:string" use="optional"/>
248250
<xs:attribute name="ExtReflnInst" type="xs:string" use="optional"/>
251+
<xs:attribute name="FlowSourceVoltageLevel" type="xs:string" use="optional"/>
249252
<xs:attribute name="FlowSourceIEDType" type="tCompasIEDType" use="optional"/>
250253
<xs:attribute name="FlowSourceIEDredundancy" type="tCompasIEDRedundancy" use="optional"/>
251254
<xs:attribute name="FlowSourceBayKind" type="xs:string" use="optional"/>
252255
<xs:attribute name="FlowSourceBayNum" type="xs:integer" use="optional"/>
253256
<xs:attribute name="FlowSourceBayNode" type="xs:integer" use="optional"/>
257+
<xs:attribute name="FlowSourceBayNodeOrder" type="xs:integer" use="optional"/>
254258
<xs:attribute name="FlowSourceNumBayBusBarSectionOrder" type="xs:integer" use="optional"/>
255259
<xs:attribute name="FlowID" type="xs:string" use="optional"/>
256260
<xs:attribute name="FlowStatus" type="tCompasFlowStatus" use="optional"/>

0 commit comments

Comments
 (0)