Skip to content

Commit 11809d4

Browse files
committed
Merge remote-tracking branch 'origin/release-1.0.5'
2 parents 0f4837e + 85aed08 commit 11809d4

26 files changed

Lines changed: 7254 additions & 8560 deletions

build/ci-cd/validate-metaschema.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fi
9898
metaschema_toolchain="${OSCALDIR}/build/metaschema/toolchains/xslt-M4"
9999
schematron="${metaschema_toolchain}/validate/metaschema-composition-check.sch"
100100
compiled_schematron="${metaschema_toolchain}/validate/metaschema-composition-check-compiled.xsl"
101-
metaschema_xsd="${metaschema_toolchain}/validate/metaschema.xsd"
101+
metaschema_xsd="${OSCALDIR}/build/metaschema/schema/xml/metaschema.xsd"
102102

103103
build_schematron "$schematron" "$compiled_schematron"
104104
cmd_exitcode=$?

build/metaschema

Submodule metaschema updated 363 files

json/convert/oscal_assessment-plan_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_assessment-results_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_catalog_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_complete_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_component_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_poam_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_profile_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

json/convert/oscal_ssp_xml-to-json-converter.xsl

Lines changed: 3 additions & 46 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)