Skip to content

Commit

Permalink
Run fixes from usnistgov/metaschema#360
Browse files Browse the repository at this point in the history
  • Loading branch information
@laurelmay
laurelmay committed May 3, 2023
1 parent bdb9011 commit 1306420
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 128 deletions.
2 changes: 1 addition & 1 deletion build/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ The following steps are known to work on [Ubuntu](https://ubuntu.com/) (tested i
cd path/to/repo/OSCAL/build
export JAVA_CLASSPATH=/opt/oscal
sudo mkdir -p "${JAVA_CLASSPATH}"
sudo chown -R $USER:USER "${JAVA_CLASSPATH}"
sudo chown -R "$USER":"$USER" "${JAVA_CLASSPATH}"
mvn dependency:copy-dependencies -DoutputDirectory="${JAVA_CLASSPATH}"
export CALABASH_HOME="${JAVA_CLASSPATH}"
export SAXON_HOME="${JAVA_CLASSPATH}"
Expand Down
2 changes: 1 addition & 1 deletion build/metaschema
Submodule metaschema updated 5 files
+8 −8 .github/workflows/workflow-generate-website.yml
+1 −1 .github/workflows/workflow-validate-repo-markdown.yml
+2 −2 .github/workflows/workflow-validate-website-content.yml
+1 −1 support/xspec
+10 −0 toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
44 changes: 22 additions & 22 deletions json/schema/oscal_assessment-plan_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
{ "scheme" :
{ "title" : "External Identifier Schema",
"description" : "Indicates the type of external identifier.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/URIDatatype" },

Expand Down Expand Up @@ -494,7 +494,7 @@
{ "name" :
{ "title" : "Property Name",
"description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -535,7 +535,7 @@
"rel" :
{ "title" : "Relation",
"description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -622,7 +622,7 @@
{ "algorithm" :
{ "title" : "Hash algorithm",
"description" : "Method by which a hash is derived",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/StringDatatype" },

Expand Down Expand Up @@ -680,7 +680,7 @@
{ "type" :
{ "title" : "type flag",
"description" : "Indicates the type of phone number.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/StringDatatype" },

Expand All @@ -702,7 +702,7 @@
{ "type" :
{ "title" : "Address Type",
"description" : "Indicates the type of address.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -745,7 +745,7 @@
{ "scheme" :
{ "title" : "Document Identification Scheme",
"description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/URIDatatype" },

Expand Down Expand Up @@ -935,7 +935,7 @@
"type" :
{ "title" : "Task Type",
"description" : "The type of task.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -1285,7 +1285,7 @@
{ "type" :
{ "title" : "Subject Type",
"description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -1339,7 +1339,7 @@
"type" :
{ "title" : "Subject Universally Unique Identifier Reference Type",
"description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -1379,7 +1379,7 @@
"type" :
{ "title" : "Subject Universally Unique Identifier Reference Type",
"description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -1543,7 +1543,7 @@
"reason" :
{ "title" : "Objective Status Reason",
"description" : "The reason the objective was given it's status.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -1599,7 +1599,7 @@
"items" :
{ "title" : "Observation Method",
"description" : "Identifies how the observation was made.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/StringDatatype" },

Expand All @@ -1614,7 +1614,7 @@
"items" :
{ "title" : "Observation Type",
"description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -1801,7 +1801,7 @@
{ "system" :
{ "title" : "Threat Type Identification System",
"description" : "Specifies the source of the threat information.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/URIDatatype" },

Expand Down Expand Up @@ -2049,7 +2049,7 @@
{ "title" : "Risk Status",
"description" : "Describes the status of the associated risk.",
"$id" : "#field_oscal-assessment-common_risk-status",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -2093,7 +2093,7 @@
"system" :
{ "title" : "Naming System",
"description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/URIDatatype" },

Expand Down Expand Up @@ -2144,7 +2144,7 @@
"lifecycle" :
{ "title" : "Remediation Intent",
"description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -2242,7 +2242,7 @@
"name" :
{ "title" : "Part Name",
"description" : "A textual label that uniquely identifies the part's semantic type.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -2479,7 +2479,7 @@
"type" :
{ "title" : "Component Type",
"description" : "A category describing the purpose of the component.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/StringDatatype" },

Expand Down Expand Up @@ -2621,7 +2621,7 @@
{ "state" :
{ "title" : "Implementation State",
"description" : "Identifies the implementation status of the control or control objective.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/TokenDatatype" },

Expand Down Expand Up @@ -2810,7 +2810,7 @@
{ "identifier-type" :
{ "title" : "Identification System Type",
"description" : "Identifies the identification system from which the provided identifier was assigned.",
"allOf" :
"anyOf" :
[
{ "$ref" : "#/definitions/URIDatatype" },

Expand Down
Loading

0 comments on commit 1306420

Please sign in to comment.