Merge pull request #145 from com-pas/develop

New release
com-pas · Jun 27, 2022 · 4da16ff · 4da16ff
2 parents 4f3d20a + ce6e50b
commit 4da16ff
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 [![Maven Build Github Action Status](<https://img.shields.io/github/workflow/status/com-pas/compas-core/Maven%20Build?logo=GitHub>)](https://github.com/com-pas/compas-core/actions?query=workflow%3A%22Maven+Build%22)
 [![REUSE status](https://api.reuse.software/badge/github.com/com-pas/compas-core)](https://api.reuse.software/info/github.com/com-pas/compas-core)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com-pas_compas-core&metric=alert_status)](https://sonarcloud.io/dashboard?id=com-pas_compas-core)
-[![LFX Security Status](https://img.shields.io/badge/dynamic/json?color=orange&label=LFX%20Security%20Tool&query=issues%5B%3F%28%40%5B%27repository-name%27%5D%20%3D%3D%20%27compas-core%27%29%5D%5B%27high-open-issues%27%5D&suffix=%20High%20open%20issues&url=https%3A%2F%2Fapi.security.lfx.linuxfoundation.org%2Fv1%2Fproject%2Fe8b6fdf9-2686-44c5-bbaa-6965d04ad3e1%2Fissues)](https://security.lfx.linuxfoundation.org/#/e8b6fdf9-2686-44c5-bbaa-6965d04ad3e1/issues)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5925/badge)](https://bestpractices.coreinfrastructure.org/projects/5925)
 [![Slack](https://raw.githubusercontent.com/com-pas/compas-architecture/master/public/LFEnergy-slack.svg)](http://lfenergy.slack.com/)
 
 # Core components

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,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>2.8.2.Final</quarkus.platform.version>
+        <quarkus.platform.version>2.10.0.Final</quarkus.platform.version>
         <slf4j.version>1.7.36</slf4j.version>
         <jaxb.bind.version>2.3.6</jaxb.bind.version>
         <openpojo.version>0.9.1</openpojo.version>

diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd
@@ -13,6 +13,7 @@ SPDX-License-Identifier: Apache-2.0
         <xs:documentation xml:lang="en">
             Version 1.0 Release 2021/06/16
             Version 1.1 Release 2022/01/21
+            Version 1.2 Release 2022/06/08
         </xs:documentation>
     </xs:annotation>
 
@@ -150,12 +151,24 @@ SPDX-License-Identifier: Apache-2.0
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:enumeration value="BAY_EXTERNAL"/>
             <xs:enumeration value="BAY_INTERNAL"/>
-            <xs:enumeration value="BAY_INTERNAL_EXTERNAL"/>
+            <xs:enumeration value="BAY_EXTERNAL"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="tCompasTopoNodeDirection">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">
+                Define if a Node Direction is Up or Down
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Up"/>
+            <xs:enumeration value="Down"/>
         </xs:restriction>
     </xs:simpleType>
 
+
     <xs:complexType name="tCompasFlow">
         <xs:annotation>
             <xs:documentation xml:lang="en">
@@ -182,23 +195,14 @@ SPDX-License-Identifier: Apache-2.0
                 The BayCodif is specific to each user to identify the bay kind.
             </xs:documentation>
         </xs:annotation>
-        <xs:attribute name="BayCodif" type="xs:string" use="optional"/>
         <xs:attribute name="UUID" type="xs:string" use="optional"/>
+        <xs:attribute name="Indice" type="xs:string" use="optional"/>
         <xs:attribute name="Version" type="xs:string" use="optional"/>
         <xs:attribute name="MainLabel" type="xs:string" use="optional"/>
         <xs:attribute name="SecondLabel" type="xs:string" use="optional"/>
-        <xs:attribute name="NumBay" type="xs:string" use="optional"/>
-        <xs:attribute name="ZoneNumber" type="xs:string" use="optional"/>
-    </xs:complexType>
-
-    <xs:complexType name="tCompasConnectivityNode">
-        <xs:annotation>
-            <xs:documentation xml:lang="en">
-                Define the specific busbarsection or zone of the connectivity node
-            </xs:documentation>
-        </xs:annotation>
-        <xs:attribute name="UUID" type="xs:string" use="optional"/>
-        <xs:attribute name="ZoneNumber" type="xs:string" use="optional"/>
+        <xs:attribute name="BayCodif" type="xs:string" use="optional"/>
+        <xs:attribute name="NumBay" type="xs:integer" use="optional"/>
+        <xs:attribute name="BayCount" type="xs:integer" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="tCompasICDHeader" mixed="true">
@@ -263,14 +267,27 @@ SPDX-License-Identifier: Apache-2.0
         <xs:attribute name="CriteriaAssociationID" type="xs:string" use="optional"/>
     </xs:complexType>
 
+    <xs:complexType name="tCompasTopo">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">
+                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
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="Node" type="xs:string" use="required"/>
+        <xs:attribute name="NodeOrder" type="xs:integer" use="required"/>
+        <xs:attribute name="Direction" type="tCompasTopoNodeDirection" use="required"/>
+    </xs:complexType>
+
+
     <xs:element name="SclName" type="tCompasSclName"/>
     <xs:element name="SclFileType" type="tCompasSclFileType"/>
     <xs:element name="Flow" type="tCompasFlow"/>
-    <xs:element name="ConnectivityNode" type="tCompasConnectivityNode"/>
     <xs:element name="Bay" type="tCompasBay"/>
     <xs:element name="LDevice" type="tCompasLDevice"/>
     <xs:element name="Criteria" type="tCompasCriteria"/>
     <xs:element name="ICDHeader" type="tCompasICDHeader"/>
     <xs:element name="SystemVersion" type="tCompasSystemVersion"/>
     <xs:element name="Function" type="tCompasFunction"/>
-</xs:schema>
+    <xs:element name="Topo" type="tCompasTopo"/>
+
+</xs:schema>