Merge pull request #307 from com-pas/develop

Release 0.18.0
com-pas · Dec 12, 2023 · 8fbf32b · 8fbf32b
2 parents c508707 + 9f2a8cb
commit 8fbf32b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -35,7 +35,7 @@ jobs:
         run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         if: ${{ steps.release.outputs.release_created }}
         with:
           distribution: 'zulu'

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -25,7 +25,7 @@ jobs:
         run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -67,7 +67,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml
@@ -44,7 +44,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@ 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.5.3</quarkus.platform.version>
+        <quarkus.platform.version>3.6.1</quarkus.platform.version>
         <log4j2.version>2.22.0</log4j2.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
@@ -171,7 +171,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.2</version>
+                    <version>3.6.3</version>
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>

diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
@@ -17,6 +17,7 @@ SPDX-License-Identifier: Apache-2.0
             Version 1.3 Release 2022/09/08
             Version 1.4 Release 2023/02/28
             Version 1.5 Release 2023/04/05
+            Version 1.6 Release 2023/12/06
         </xs:documentation>
     </xs:annotation>
 
@@ -126,6 +127,7 @@ SPDX-License-Identifier: Apache-2.0
             <xs:enumeration value="AUT"/>
             <xs:enumeration value="PDIF"/>
             <xs:enumeration value="GRP"/>
+            <xs:enumeration value="ASLD"/>
             <xs:enumeration value="GW"/>
             <xs:enumeration value="TG"/>
             <xs:enumeration value="TOPO"/>
@@ -246,11 +248,13 @@ SPDX-License-Identifier: Apache-2.0
         <xs:attribute name="ExtRefprefix" type="xs:string" use="optional"/>
         <xs:attribute name="ExtReflnClass" type="xs:string" use="optional"/>
         <xs:attribute name="ExtReflnInst" type="xs:string" use="optional"/>
+        <xs:attribute name="FlowSourceVoltageLevel" type="xs:string" use="optional"/>
         <xs:attribute name="FlowSourceIEDType" type="tCompasIEDType" use="optional"/>
         <xs:attribute name="FlowSourceIEDredundancy" type="tCompasIEDRedundancy" use="optional"/>
         <xs:attribute name="FlowSourceBayKind" type="xs:string" use="optional"/>
         <xs:attribute name="FlowSourceBayNum" type="xs:integer" use="optional"/>
         <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="FlowID" type="xs:string" use="optional"/>
         <xs:attribute name="FlowStatus" type="tCompasFlowStatus" use="optional"/>