Added legacy Withdrawn status with deprecation entry (#1419)

usnistgov · Jul 10, 2023 · 4ef21bb · 4ef21bb
1 parent b972ec3
commit 4ef21bb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/metaschema/oscal_catalog_metaschema.xml b/src/metaschema/oscal_catalog_metaschema.xml
@@ -197,13 +197,14 @@
                   <!-- <any/> -->
             </model>
             <constraint>
-                  <expect id="catalog-control-require-statement-when-not-withdrawn" target="." test="prop[@name='status']/@value='withdrawn' or part[@name='statement']" />
+                  <expect id="catalog-control-require-statement-when-not-withdrawn" target="." test="prop[@name='status']/@value=('withdrawn','Withdrawn') or part[@name='statement']" />
                   <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
             &allowed-values-control-group-property-name;
                         <enum value="status">The status of a <code>control</code>. For example, a value of 'withdrawn' can indicate that the <code>control</code> has been withdrawn and should no longer be used.</enum>
                   </allowed-values>
                   <allowed-values target="prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='status']/@value">
                         <enum value="withdrawn">The control is no longer used.</enum>
+                        <enum value="Withdrawn" deprecated="1.0.0">**(deprecated)*** Use 'withdrawn' instead.</enum>
                   </allowed-values>
                   <allowed-values target="link/@rel" allow-other="yes">
                         <enum value="reference">The link cites an external resource related to this control.</enum>
@@ -218,7 +219,7 @@
                         <enum value="statement">A set of control implementation requirements.</enum>
                         <enum value="guidance">Additional information to consider when selecting, implementing, assessing, and monitoring a control.</enum>
                         <enum value="assessment" deprecated="1.0.1">**(deprecated)** Use 'assessment-method' instead.</enum>
-                        <enum value="assessment-method" deprecated="1.0.1">The part describes a method-based assessment over a set of assessment objects.</enum>
+                        <enum value="assessment-method">The part describes a method-based assessment over a set of assessment objects.</enum>
                   </allowed-values>
                   <allowed-values target="part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='statement']//part[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@name">
                         <enum value="item">An individual item within a control statement.</enum>