Updating content converters.

danielnaab · Jun 10, 2021 · 4cab363 · 4cab363
1 parent 790300f
commit 4cab363
Show file tree

Hide file tree

Showing 18 changed files with 5,466 additions and 58,533 deletions.
diff --git a/build/ci-cd/validate-content-conversion-round-trips.sh b/build/ci-cd/validate-content-conversion-round-trips.sh
@@ -249,7 +249,7 @@ process_paths() {
 
         case $source_format in
         xml)
-          result=$(python ${OSCALDIR}/build/ci-cd/python/xmlComparison.py "$roundtrip_file" "$source_file" 2>&1)
+          result=$(python3 ${OSCALDIR}/build/ci-cd/python/xmlComparison.py "$roundtrip_file" "$source_file" 2>&1)
           ;;
         json)
           result=$(json-diff "$source_file" "$roundtrip_file" 2>&1)

diff --git a/build/metaschema b/build/metaschema
diff --git a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
diff --git a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_catalog_json-to-xml-converter.xsl b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_component_json-to-xml-converter.xsl b/xml/convert/oscal_component_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_poam_json-to-xml-converter.xsl b/xml/convert/oscal_poam_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_profile_json-to-xml-converter.xsl b/xml/convert/oscal_profile_json-to-xml-converter.xsl
diff --git a/xml/convert/oscal_ssp_json-to-xml-converter.xsl b/xml/convert/oscal_ssp_json-to-xml-converter.xsl