Fixes to correct metaschema validation errors.

usnistgov · Jan 10, 2023 · 84d2d46 · 84d2d46
1 parent a199209
commit 84d2d46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build/ci-cd/validate-metaschema.sh b/build/ci-cd/validate-metaschema.sh
@@ -98,7 +98,7 @@ fi
 metaschema_toolchain="${OSCALDIR}/build/metaschema/toolchains/xslt-M4"
 schematron="${metaschema_toolchain}/validate/metaschema-composition-check.sch"
 compiled_schematron="${metaschema_toolchain}/validate/metaschema-composition-check-compiled.xsl"
-metaschema_xsd="${metaschema_toolchain}/validate/metaschema.xsd"
+metaschema_xsd="${OSCALDIR}/build/metaschema/schema/xml/metaschema.xsd"
 
 build_schematron "$schematron" "$compiled_schematron"
 cmd_exitcode=$?

diff --git a/build/metaschema b/build/metaschema
diff --git a/src/metaschema/oscal_assessment-common_metaschema.xml b/src/metaschema/oscal_assessment-common_metaschema.xml
@@ -1055,7 +1055,7 @@
          <assembly ref="link" max-occurs="unbounded">
             <group-as name="links" in-json="ARRAY"/>
          </assembly>
-         <field ref="risk-status" as-type="token" min-occurs="1">
+         <field ref="risk-status" min-occurs="1">
             <use-name>status</use-name>
          </field>
          <assembly ref="origin" max-occurs="unbounded">