Merge branch 'develop' into dependabot/github_actions/whelk-io/maven-…

…settings-xml-action-22
com-pas · Feb 26, 2024 · eb4b7e7 · eb4b7e7
2 parents ff43662 + 9113a9c
commit eb4b7e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -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.1</quarkus.platform.version>
-        <log4j2.version>2.22.1</log4j2.version>
+        <quarkus.platform.version>3.7.4</quarkus.platform.version>
+        <log4j2.version>2.23.0</log4j2.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
 

diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
@@ -18,6 +18,7 @@ SPDX-License-Identifier: Apache-2.0
             Version 1.4 Release 2023/02/28
             Version 1.5 Release 2023/04/05
             Version 1.6 Release 2023/12/06
+            Version 1.7 Release 2024/02/07
         </xs:documentation>
     </xs:annotation>
 
@@ -127,10 +128,19 @@ SPDX-License-Identifier: Apache-2.0
             <xs:enumeration value="AUT"/>
             <xs:enumeration value="PDIF"/>
             <xs:enumeration value="GRP"/>
+            <xs:enumeration value="GRPR"/>
             <xs:enumeration value="ASLD"/>
             <xs:enumeration value="GW"/>
             <xs:enumeration value="TG"/>
             <xs:enumeration value="TOPO"/>
+            <xs:enumeration value="SWC"/>
+            <xs:enumeration value="SWT"/>
+            <xs:enumeration value="SW"/>
+            <xs:enumeration value="OUT"/>
+            <xs:enumeration value="CLUS"/>
+            <xs:enumeration value="VIRT"/>
+            <xs:enumeration value="ICT"/>
+            <xs:enumeration value="SYN"/>
             <xs:enumeration value="ADEFINIR"/>
             <xs:enumeration value="IEDTEST"/>
         </xs:restriction>
@@ -387,4 +397,4 @@ SPDX-License-Identifier: Apache-2.0
     <xs:element name="SystemVersion" type="tCompasSystemVersion"/>
     <xs:element name="Function" type="tCompasFunction"/>
     <xs:element name="Topo" type="tCompasTopo"/>
-</xs:schema>
+</xs:schema>