diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl index bcb4cc42b8..8806078de6 100644 --- a/json/convert/oscal_complete_xml-to-json-converter.xsl +++ b/json/convert/oscal_complete_xml-to-json-converter.xsl @@ -1151,7 +1151,7 @@ - @@ -2709,6 +2709,7 @@ + @@ -3924,7 +3925,7 @@ - - - + + + + + title + + + + + + + + + + + description + + + + + + + + + + + + + purpose + + + + + + + + + + + text + + + + + + + + + + + status + + + + + + + + + + text + + + + + + + + + + + title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + title + + + + + + + + + + + text + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text + + + + + + + + + + + text + + + + + + diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl index 7993ee2b5c..9d571983dd 100644 --- a/json/convert/oscal_poam_xml-to-json-converter.xsl +++ b/json/convert/oscal_poam_xml-to-json-converter.xsl @@ -76,7 +76,7 @@ - + @@ -409,6 +409,7 @@ + @@ -544,6 +545,31 @@ + + + + + assessment-assets + + + + + + + + + + + + + + + + + @@ -1372,7 +1398,7 @@ - + + + + + + + + + + @@ -2986,6 +3034,263 @@ + + + + + title + + + + + + + + + + + description + + + + + + + + + + + + + purpose + + + + + + + + + + + text + + + + + + + + + + + status + + + + + + + + + + text + + + + + + + + + + + title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + title + + + + + + + + + + + text + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text + + + + + + + + + + + text + + + + + + diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json index 3d098c89c0..56d9c060be 100644 --- a/json/schema/oscal_complete_schema.json +++ b/json/schema/oscal_complete_schema.json @@ -4908,6 +4908,8 @@ "minItems" : 1, "items" : { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } }, + "assessment-assets" : + { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "additionalProperties" : false }, diff --git a/json/schema/oscal_poam_schema.json b/json/schema/oscal_poam_schema.json index 09e7285b18..fc8e2c8464 100644 --- a/json/schema/oscal_poam_schema.json +++ b/json/schema/oscal_poam_schema.json @@ -60,6 +60,8 @@ "minItems" : 1, "items" : { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } }, + "assessment-assets" : + { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" }, "remarks" : { "$ref" : "#field_oscal-metadata_remarks" } }, "additionalProperties" : false }, diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl index 77a317fce8..dce34f9ba5 100644 --- a/xml/convert/oscal_complete_json-to-xml-converter.xsl +++ b/xml/convert/oscal_complete_json-to-xml-converter.xsl @@ -575,9 +575,9 @@ - + - + @@ -1293,6 +1293,7 @@ + @@ -2697,8 +2698,8 @@ - + - - + - - + - + + + + + + title + + + + + + + + + + + + + + + description + + + + + + + + + + + + + + + purpose + + + + + + + + + + + + + + + text + + + + + + + + + + + + + + + status + + + + + + + + + + + text + + + + + + + + + + + + + + + title + + + + + + + + + + + + + + + + + + + + + + + + + + + title + + + + + + + + + + + + + + + text + + + + + + + + + + + + + + + + + + + + + + + + + + text + + + + + + + + + + + + + + + text + + + + + + + + + diff --git a/xml/convert/oscal_poam_json-to-xml-converter.xsl b/xml/convert/oscal_poam_json-to-xml-converter.xsl index c31a9001e7..3c4a3bcdb1 100644 --- a/xml/convert/oscal_poam_json-to-xml-converter.xsl +++ b/xml/convert/oscal_poam_json-to-xml-converter.xsl @@ -237,6 +237,7 @@ + @@ -300,6 +301,19 @@ + + + + + + assessment-assets + + + + + @@ -916,8 +930,8 @@ - + - + + + + + + + + + + + + + + + + + + title + + + + + + + + + + + + + + + description + + + + + + + + + + + + + + + purpose + + + + + + + + + + + + + + + text + + + + + + + + + + + + + + + status + + + + + + + + + + + text + + + + + + + + + + + + + + + title + + + + + + + + + + + + + + + + + + + + + + + + + + + title + + + + + + + + + + + + + + + text + + + + + + + + + + + + + + + + + + + + + + + + + + text + + + + + + + + + + + + + + + text + + + + + + + + + diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd index 96975fb8ef..2a52c64cef 100644 --- a/xml/schema/oscal_complete_schema.xsd +++ b/xml/schema/oscal_complete_schema.xsd @@ -8409,6 +8409,10 @@ type="oscal-implementation-common-inventory-item-ASSEMBLY" minOccurs="0" maxOccurs="unbounded"/> + diff --git a/xml/schema/oscal_poam_schema.xsd b/xml/schema/oscal_poam_schema.xsd index 9a803bbe1a..b895a1f1c6 100644 --- a/xml/schema/oscal_poam_schema.xsd +++ b/xml/schema/oscal_poam_schema.xsd @@ -92,6 +92,10 @@ type="oscal-implementation-common-inventory-item-ASSEMBLY" minOccurs="0" maxOccurs="unbounded"/> +