From eeb54c11a348b1411b27383769a9095801bcddf3 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Thu, 4 Aug 2022 18:56:58 +0200 Subject: [PATCH] imported-from relations for usnistgov/OSCAL#1023. Co-authored-by: David Waltermire Signed-off-by: Alexander Stein --- README_validations.md | 2 +- build/ci-cd/README.md | 4 ++-- build/ci-cd/python/{readme.md => README.md} | 2 +- docs/content/contribute/dev-lunch/meeting-2020-05-07.md | 2 +- docs/content/contribute/dev-lunch/meeting-2020-05-21.md | 2 +- src/metaschema/oscal_implementation-common_metaschema.xml | 1 + src/metaschema/oscal_ssp_metaschema.xml | 4 ++++ xml/README.md | 4 ++-- 8 files changed, 13 insertions(+), 8 deletions(-) rename build/ci-cd/python/{readme.md => README.md} (98%) diff --git a/README_validations.md b/README_validations.md index 7a64a1b122..76dbd75c08 100644 --- a/README_validations.md +++ b/README_validations.md @@ -26,7 +26,7 @@ For OSCAL XML, this schema syntax is [XML Schema Definition (XSD)](https://www.w Each tool will have its own way to provide for validation. Bindings or configurations to link documents to schemas can be maintained either inside or outside the documents themselves; many tools offer several ways to do this. -Some tools support self-contained validation functionality without full-fledged application frameworks or development environments, with tools like [`xmllint`](http://xmlsoft.org/xmllint.html) offering command-line interfaces. Similarly, you can use the [`ajv-cli`](https://github.com/ajv-validator/ajv-cli) for JSON. +Some tools support self-contained validation functionality without full-fledged application frameworks or development environments, with tools like [`xmllint`](https://linux.die.net/man/1/xmllint/) offering command-line interfaces. Similarly, you can use the [`ajv-cli`](https://github.com/ajv-validator/ajv-cli) for JSON. ## What does success look like? diff --git a/build/ci-cd/README.md b/build/ci-cd/README.md index a3cbd4e782..c1452118b0 100644 --- a/build/ci-cd/README.md +++ b/build/ci-cd/README.md @@ -65,8 +65,8 @@ Not every script above is run with every pull request as part of the CI/CD syste The bash scripts used in the CI/CD workflow can be run locally in the correct environment. In addition to a bash shell, to run these scripts the following must be installed: -- [xmlint](http://xmlsoft.org/xmllint.html) -- Java 8.0 or greater +- [xmlint](https://linux.die.net/man/1/xmllint/) +- Java 11 or greater - [Apache Maven](https://maven.apache.org/) 3.6.1 or greater - [Node.js and Node Package Manager (NPM)](https://nodejs.org/en/) 10.15.3 or greater - 'Another Json Validator' Command Line Interface ([ajv-cli](https://github.com/jessedc/ajv-cli)) v3.0.0 or greater diff --git a/build/ci-cd/python/readme.md b/build/ci-cd/python/README.md similarity index 98% rename from build/ci-cd/python/readme.md rename to build/ci-cd/python/README.md index fdb9602d07..ce4050d6f8 100644 --- a/build/ci-cd/python/readme.md +++ b/build/ci-cd/python/README.md @@ -5,7 +5,7 @@ This code provides test coverage to validate the OSCAL artifacts as new document ### Pre-Requisites 1. [Python 2.7.10 or greater](https://www.python.org/) -2. [xmllint](http://xmlsoft.org/xmllint.html) +2. [xmllint](https://linux.die.net/man/1/xmllint/) 3. Java 8.0 or greater 4. [Saxon 10 HE](http://saxon.sourceforge.net/) diff --git a/docs/content/contribute/dev-lunch/meeting-2020-05-07.md b/docs/content/contribute/dev-lunch/meeting-2020-05-07.md index 048a633316..f79bf9f0d7 100644 --- a/docs/content/contribute/dev-lunch/meeting-2020-05-07.md +++ b/docs/content/contribute/dev-lunch/meeting-2020-05-07.md @@ -19,4 +19,4 @@ sidenav: ## Notes -- There is interest in having the model discussion. A Doodle pool will be sent to the oscal-dev@nist.gov mailing list to find a good day. +- There is interest in having the model discussion. A Doodle pool will be sent to the oscal-dev@list.nist.gov mailing list to find a good day. diff --git a/docs/content/contribute/dev-lunch/meeting-2020-05-21.md b/docs/content/contribute/dev-lunch/meeting-2020-05-21.md index 20553b926c..534bdcd220 100644 --- a/docs/content/contribute/dev-lunch/meeting-2020-05-21.md +++ b/docs/content/contribute/dev-lunch/meeting-2020-05-21.md @@ -19,4 +19,4 @@ sidenav: ## Notes -- The Doodle pool results show that Fridays @ 10am EDT are the best time to have the model review meeting. The OSCAL team will send out a meeting invite for this time to the oscal-dev@nist.gov mailing list. +- The Doodle pool results show that Fridays @ 10am EDT are the best time to have the model review meeting. The OSCAL team will send out a meeting invite for this time to the [oscal-dev@list.nist.gov](mailto:oscal-dev@list.nist.gov) mailing list. diff --git a/src/metaschema/oscal_implementation-common_metaschema.xml b/src/metaschema/oscal_implementation-common_metaschema.xml index 199eb552ee..68097e6bae 100644 --- a/src/metaschema/oscal_implementation-common_metaschema.xml +++ b/src/metaschema/oscal_implementation-common_metaschema.xml @@ -109,6 +109,7 @@ &allowed-values-component_component_link-rel; This component uses the network provided by the identified network component. + The hyperlink identifies a URI pointing to the component in a component-definition that originally defined the component. diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml index de446373a2..8f64ae5e3e 100644 --- a/src/metaschema/oscal_ssp_metaschema.xml +++ b/src/metaschema/oscal_ssp_metaschema.xml @@ -1020,6 +1020,10 @@ + + + The hyperlink identifies a URI pointing to the component in a component-definition that originally defined the component. + &allowed-values-responsible-roles-operations; &allowed-values-responsible-roles-component-production; diff --git a/xml/README.md b/xml/README.md index 5a6f6b7b42..60598e7a77 100644 --- a/xml/README.md +++ b/xml/README.md @@ -36,7 +36,7 @@ XML Schema based on the [XML Schema Definition Language (XSD) 1.1](https://www.w ## Validating OSCAL XML Content -The OSCAL project uses [xmllint](http://xmlsoft.org/xmllint.html) to perform automated validation of all XML-based OSCAL [content](../content) provided in this repository. *xmllint* is an open source tool that can be [downloaded](http://xmlsoft.org/downloads.html), installed, and run on OSX, Linux, and Windows environments. +The OSCAL project uses [xmllint](https://linux.die.net/man/1/xmllint/) to perform automated validation of all XML-based OSCAL [content](../content) provided in this repository. *xmllint* is an open source tool that can be downloaded, installed, and run on OSX, Linux, and Windows environments with your preferred package manager. The following example uses **xmllint** to perform validation of an OSCAL catalog XML file. @@ -44,7 +44,7 @@ The following example uses **xmllint** to perform validation of an OSCAL catalog xmllint --noout --schema "oscal_catalog_schema.xsd" "catalog.xml" ``` -The [online documentation](http://xmlsoft.org/xmllint.html) for *xmllint* provides more information on the commandline arguments. +The [online documentation](https://linux.die.net/man/1/xmllint/) for *xmllint* provides more information on the commandline arguments. # OSCAL JSON to XML Converters