Merge branch 'release-1.0'

usnistgov · Jun 30, 2023 · 674f724 · 674f724
2 parents 59e68b5 + 5ea8069
commit 674f724
Show file tree

Hide file tree

Showing 40 changed files with 1,228 additions and 663 deletions.
diff --git a/build/ci-cd/README.md b/build/ci-cd/README.md
@@ -48,7 +48,7 @@ graph TD
 The following scripts and tools in this repository and its submodules are itemized below. 
 
 1. [run-all.sh](run-all.sh): Runs all of the scripts in workflow order.
-1. [validate-metaschema.sh](validate-metaschema.sh): Ensures that all [metaschema](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema) are valid according to the [metaschema XML schema](https://github.com/usnistgov/metaschema/blob/master/toolchains/xslt-M4/validate/metaschema.xsd).
+1. [validate-metaschema.sh](validate-metaschema.sh): Ensures that all [metaschema](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema) are valid according to the [metaschema XML schema](https://github.com/usnistgov/metaschema/blob/main/schema/xml/metaschema.xsd).
 1. [generate-schema.sh](generate-schema.sh): Generates [XML schema](https://github.com/usnistgov/OSCAL/tree/master/xml/schema) and [JSON schema](https://github.com/usnistgov/OSCAL/tree/master/json/schema) files for each OSCAL model based on their [respective metaschemas](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema).
 1. [validate-content.sh](validate-content.sh): Validates OSCAL content in the repository's [src](https://github.com/usnistgov/OSCAL/tree/master/src) against the content's respective OSCAL model and format.
 1. [generate-content-converters.sh](generate-content-converters.sh): Generates [JSON to XML](https://github.com/usnistgov/OSCAL/tree/master/xml/convert) and [XML to JSON](https://github.com/usnistgov/OSCAL/tree/master/json/convert) content conversion scripts for each OSCAL model based on their [respective metaschemas](https://github.com/usnistgov/OSCAL/tree/master/src/metaschema).

diff --git a/build/metaschema b/build/metaschema
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
@@ -1944,7 +1944,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -2083,7 +2083,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -2276,7 +2276,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -2469,7 +2469,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">

diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
@@ -5468,7 +5468,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -5607,7 +5607,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -5800,7 +5800,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -5993,7 +5993,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -7288,7 +7288,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -7687,7 +7687,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -7826,7 +7826,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -9035,7 +9035,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -9135,7 +9135,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -9397,7 +9397,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -9497,7 +9497,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -12043,7 +12043,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -12127,7 +12127,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -12273,7 +12273,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -12783,7 +12783,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">

diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl
@@ -2034,7 +2034,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2134,7 +2134,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2396,7 +2396,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -2496,7 +2496,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">

diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
@@ -2373,7 +2373,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -2772,7 +2772,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
@@ -2911,7 +2911,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="markup-line"
-             name="parameter-choice"
+             name="choice"
              gi="choice"
              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">

diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
@@ -3885,7 +3885,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -3969,7 +3969,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -4115,7 +4115,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">
@@ -4625,7 +4625,7 @@
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
              as-type="string"
-             name="parameter-value"
+             name="value"
              gi="value"
              in-json="SCALAR">
          <value as-type="string" in-json="string">