Skip to content
Open
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f01bf6f
defined additional allowed values for the control 'status' property
brian-ruf Mar 2, 2026
ad9b5a5
Merge branch 'develop' into control-status
brian-ruf Mar 3, 2026
2d4dc06
fix: resolve Prototype Pollution in fast-json-patch (GHSA-8gh8-hqwg-x…
nancysangani Mar 11, 2026
a2b3859
fix: resolve fast-json-patch Prototype Pollution vulnerability (GHSA-…
nancysangani Mar 12, 2026
62118bb
Fix responsible-role party-uuid constraint to only check when present…
nancysangani Mar 13, 2026
346344e
Bump actions/checkout from 6.0.1 to 6.0.2
dependabot[bot] Mar 15, 2026
e3af886
Merge branch 'develop' into control-status
iMichaela Mar 15, 2026
4d71697
fix: resolve Prototype Pollution in fast-json-patch (GHSA-8gh8-hqwg-x…
nancysangani Mar 11, 2026
e0eb529
fix: resolve fast-json-patch Prototype Pollution vulnerability (GHSA-…
nancysangani Mar 12, 2026
76ef0cb
Fix responsible-role party-uuid constraint to only check when present…
nancysangani Mar 13, 2026
ff6a269
Bump actions/checkout from 6.0.1 to 6.0.2
dependabot[bot] Mar 15, 2026
26bf22d
Bump actions/setup-node from 6.2.0 to 6.3.0
dependabot[bot] Mar 15, 2026
59b59d2
Corrected broken link to the profile-resolution spec.
Mar 16, 2026
bf6e3a0
Bump com.xmlcalabash:xmlcalabash from 3.0.31 to 3.0.42 in /build
dependabot[bot] Mar 16, 2026
6bf9c80
Bump org.apache.maven.plugins:maven-dependency-plugin in /build
dependabot[bot] Mar 16, 2026
6ce92ba
Merge branch 'develop' into control-status
iMichaela Mar 17, 2026
b10d13d
Fixes broken URL
Mar 17, 2026
026b8b5
Propagating older constraint value change from validated-by to valida…
Mar 17, 2026
22d4c37
Merge branch 'develop' into control-status
iMichaela Mar 17, 2026
39087b1
revised the allowed values list per comments in PR usnistgov/OSCAL#2022
brian-ruf Mar 17, 2026
2325f36
Updated CONTRIBUTING.md
Mar 25, 2026
ccd3562
Merge branch 'develop' into control-status
iMichaela Mar 30, 2026
bd25bc3
Merge branch 'develop' into control-status
iMichaela May 5, 2026
c73ccfe
Fixed conflict in pom.xml
May 5, 2026
8442ac7
Merge branch 'develop' into control-status
iMichaela May 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/metaschema/oscal_catalog_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,16 @@
value of 'withdrawn' can indicate that the <code>control</code> has
been withdrawn and should no longer be used.</enum>
</allowed-values>
<allowed-values id="oscal-control-prop-status-value"
<allowed-values id="oscal-control-prop-status-value" allow-other="yes"
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>
<enum value="withdrawn">The control is no longer used. It may have been retired, incorporated into another control, or moved to a different control.</enum>
<enum value="normal">[Default] This control exists as intended.</enum>
<enum value="reserved">This is a placeholder for a future control.</enum>
<enum value="deprecated">This control will be withdrawn. The withdrawn timeline or milestone may be describe the remarks.</enum>
<enum value="conditional">This control is only applicable under certain conditions described in the remarks.</enum>
<enum value="superseded">This control has been superseded by the artifact indicated by one or more "superseded-by" links or as described in the remarks.</enum>
<enum value="modified">This control has been updated from a prior version, as described in the remarks.</enum>
<enum value="experimental">This control is a pilot or proposed control; not yet required.</enum>
</allowed-values>
<allowed-values id="oscal-control-link-rel-type" target="link/@rel" allow-other="yes">
<enum value="reference">The link cites an external resource related to this
Expand Down