Skip to content

Commit ae40d4a

Browse files
authored
Merge pull request #276 from OVAL-Community/275-update-last_deployment_change_time-to-be-a-simple-string-as-xsddate-does-not-allow-any-operations
Added DateType and updated state and item to use it vs xsd:date
2 parents 27aceb1 + 8bd2b46 commit ae40d4a

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

oval-schemas/oval-definitions-schema.xsd

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,6 +1684,22 @@
16841684
</xsd:restriction>
16851685
</xsd:simpleContent>
16861686
</xsd:complexType>
1687+
1688+
<xsd:complexType name="EntityStateDateType">
1689+
<xsd:annotation>
1690+
<xsd:documentation>The EntityDateType type is extended by the entities of an individual OVAL State. This type provides uniformity to each state entity by including the attributes found in the EntityStateSimpleBaseType. This specific type is an XML date.</xsd:documentation>
1691+
</xsd:annotation>
1692+
<xsd:simpleContent>
1693+
<xsd:restriction base="oval-def:EntityStateSimpleBaseType">
1694+
<xsd:simpleType>
1695+
<xsd:restriction base="xsd:date"/>
1696+
</xsd:simpleType>
1697+
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="optional" fixed="string"/>
1698+
</xsd:restriction>
1699+
</xsd:simpleContent>
1700+
</xsd:complexType>
1701+
1702+
16871703
<xsd:complexType name="EntityStateBinaryType">
16881704
<xsd:annotation>
16891705
<xsd:documentation>The EntityStateBinaryType type is extended by the entities of an individual OVAL State. This type provides uniformity to each state entity by including the attributes found in the EntityStateSimpleBaseType. This specific type describes simple binary data. The empty string is also allowed when using a variable reference with an element.</xsd:documentation>

oval-schemas/oval-system-characteristics-schema.xsd

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,21 @@
471471
</xsd:restriction>
472472
</xsd:simpleContent>
473473
</xsd:complexType>
474+
475+
<xsd:complexType name="EntityItemDateType">
476+
<xsd:annotation>
477+
<xsd:documentation>The EntityDateType type is extended by the entities of an individual OVAL State. This type provides uniformity to each entity by including the attributes found in the EntityItemSimpleBaseType. This specific type is an XML date.</xsd:documentation>
478+
</xsd:annotation>
479+
<xsd:simpleContent>
480+
<xsd:restriction base="oval-sc:EntityItemSimpleBaseType">
481+
<xsd:simpleType>
482+
<xsd:restriction base="xsd:date"/>
483+
</xsd:simpleType>
484+
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="optional" fixed="string"/>
485+
</xsd:restriction>
486+
</xsd:simpleContent>
487+
</xsd:complexType>
488+
474489
<xsd:complexType name="EntityItemBinaryType">
475490
<xsd:annotation>
476491
<xsd:documentation>The EntityItemBinaryType type is extended by the entities of an individual item. This type provides uniformity to each entity by including the attributes found in the EntityItemSimpleBaseType. This specific type describes simple binary data. The empty string is also allowed for cases where there was an error in the data collection of an entity and a status needs to be reported.</xsd:documentation>

oval-schemas/windows-definitions-schema.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9441,7 +9441,7 @@
94419441
<xsd:documentation>The Microsoft Security Response Center (MSRC) rating provided by Microsoft related to this update ID, includes 'Critical', 'Important', 'Moderate', 'Low', 'Unspecified', ''</xsd:documentation>
94429442
</xsd:annotation>
94439443
</xsd:element>
9444-
<xsd:element name="last_deployment_change_time" type="xsd:date" minOccurs="0" maxOccurs="1">
9444+
<xsd:element name="last_deployment_change_time" type="oval-def:EntityStateDateType" minOccurs="0" maxOccurs="1">
94459445
<xsd:annotation>
94469446
<xsd:documentation>The last published date of the update, provided by Microsoft related to this update ID</xsd:documentation>
94479447
</xsd:annotation>

oval-schemas/windows-system-characteristics-schema.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3780,7 +3780,7 @@
37803780
<xsd:documentation>The Microsoft Security Response Center (MSRC) rating provided by Microsoft related to this update ID, includes 'Critical', 'Important', 'Moderate', 'Low', 'Unspecified', ''</xsd:documentation>
37813781
</xsd:annotation>
37823782
</xsd:element>
3783-
<xsd:element name="last_deployment_change_time" type="xsd:date" minOccurs="0" maxOccurs="1">
3783+
<xsd:element name="last_deployment_change_time" type="oval-sc:EntityItemDateType" minOccurs="0" maxOccurs="1">
37843784
<xsd:annotation>
37853785
<xsd:documentation>The last published date of the update, provided by Microsoft related to this update ID</xsd:documentation>
37863786
</xsd:annotation>

0 commit comments

Comments
 (0)