Merge pull request #1 from david-waltermire-nist/wendellpiez-ajv-upda…

…te-rc2 Upgrade AJV support in CI/CD
usnistgov · Feb 11, 2021 · 23574d1 · 23574d1
2 parents 9fd42a9 + 1f998b6
commit 23574d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/content-artifacts.yml b/.github/workflows/content-artifacts.yml
@@ -44,7 +44,7 @@ jobs:
           sudo apt-get install libxml2-utils
       - name: Install NPM dependencies
         run: |
-          sudo npm install -g ajv-[email protected] prettyjson
+          sudo npm install -g ajv-formats@"^1.5.x" ajv-cli@"^4.0.x" yaml-convert@"^1.0.x"
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

diff --git a/oscal b/oscal
+9 −4		build/Dockerfile
+1 −1		build/README.md
+1 −1		build/ci-cd/copy-and-convert-content.sh
+1 −1		build/metaschema
+238 −198		docs/content/documentation/schema/assessment-layer/assessment-plan/OSCAL-stack-assessment_plan.svg
+5 −2		docs/content/documentation/schema/assessment-layer/assessment-plan/_index.md
+92 −61		docs/content/documentation/schema/assessment-layer/assessment-plan/assessment-plan-model.svg
+393 −360		...content/documentation/schema/assessment-results-layer/assessment-results/OSCAL-stack-assessment_results.svg
+10 −4		docs/content/documentation/schema/assessment-results-layer/assessment-results/_index.md
+156 −92		docs/content/documentation/schema/assessment-results-layer/assessment-results/assessment-results-model.svg
+382 −305		docs/content/documentation/schema/assessment-results-layer/poam/OSCAL-stack-POAM.svg
+1 −0		docs/content/documentation/schema/assessment-results-layer/poam/_index.md
+122 −155		docs/content/documentation/schema/assessment-results-layer/poam/poam-model.svg
+1 −1		docs/content/downloads/_index.md