Skip to content

Commit

Permalink
Fix order of EmbeddedDataSpecification attributes
Browse files Browse the repository at this point in the history
Previously, the order of the attributes in class
`EmbeddedDataSpecification` got mixed up, making
the schemas of Release 3.0.8 not backward
compatible, as found out in #477.

This reverts the change of the order of attributes
back to the state of v3.0, so that the schemas are
properly backward compatible.

Fixes #477
  • Loading branch information
s-heppner committed Nov 15, 2024
1 parent b1e7ee7 commit a70d6f6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions schemas/json/aas.json
Original file line number Diff line number Diff line change
Expand Up @@ -505,16 +505,16 @@
"EmbeddedDataSpecification": {
"type": "object",
"properties": {
"dataSpecificationContent": {
"$ref": "#/definitions/DataSpecificationContent_choice"
},
"dataSpecification": {
"$ref": "#/definitions/Reference"
},
"dataSpecificationContent": {
"$ref": "#/definitions/DataSpecificationContent_choice"
}
},
"required": [
"dataSpecificationContent",
"dataSpecification"
"dataSpecification",
"dataSpecificationContent"
]
},
"Entity": {
Expand Down
8 changes: 4 additions & 4 deletions schemas/rdf/shacl-schema.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,15 @@ aas:EmbeddedDataSpecificationShape a sh:NodeShape ;
sh:targetClass aas:EmbeddedDataSpecification ;
sh:property [
a sh:PropertyShape ;
sh:path <https://admin-shell.io/aas/3/0/EmbeddedDataSpecification/dataSpecificationContent> ;
sh:class aas:DataSpecificationContent ;
sh:path <https://admin-shell.io/aas/3/0/EmbeddedDataSpecification/dataSpecification> ;
sh:class aas:Reference ;
sh:minCount 1 ;
sh:maxCount 1 ;
] ;
sh:property [
a sh:PropertyShape ;
sh:path <https://admin-shell.io/aas/3/0/EmbeddedDataSpecification/dataSpecification> ;
sh:class aas:Reference ;
sh:path <https://admin-shell.io/aas/3/0/EmbeddedDataSpecification/dataSpecificationContent> ;
sh:class aas:DataSpecificationContent ;
sh:minCount 1 ;
sh:maxCount 1 ;
] ;
Expand Down
2 changes: 1 addition & 1 deletion schemas/xml/AAS.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,14 @@
</xs:group>
<xs:group name="embeddedDataSpecification">
<xs:sequence>
<xs:element name="dataSpecification" type="reference_t"/>
<xs:element name="dataSpecificationContent">
<xs:complexType>
<xs:sequence>
<xs:group ref="dataSpecificationContent_choice"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="dataSpecification" type="reference_t"/>
</xs:sequence>
</xs:group>
<xs:group name="entity">
Expand Down

0 comments on commit a70d6f6

Please sign in to comment.