-
Notifications
You must be signed in to change notification settings - Fork 183
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cleanup of models and data #476
Merged
david-waltermire
merged 20 commits into
usnistgov:master
from
wendellpiez:issue473-rename-subcontrol
Aug 27, 2019
Merged
Cleanup of models and data #476
david-waltermire
merged 20 commits into
usnistgov:master
from
wendellpiez:issue473-rename-subcontrol
Aug 27, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rol' to 'control' per Issue usnistgov#473
…atron to detect such clashes
…nces to subcontrol elements only controls)
These files include revisions to the FedRAMP baselines, plus a small FedRAMP catalog that provides three subcontrols added by FedRAMP.
…-rename-subcontrol Updated FedRAMP Content
Also addresses #471 |
8 tasks
david-waltermire
previously approved these changes
Aug 27, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Also addresses #475 as noted above. |
3 tasks
david-waltermire
approved these changes
Aug 27, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
david-waltermire
pushed a commit
that referenced
this pull request
Aug 27, 2019
generated from commit 0153500
5 tasks
bradh
pushed a commit
to bradh/OSCAL
that referenced
this pull request
Dec 4, 2019
* Schematron now reports duplicate definitions in a Metaschema as an error: see usnistgov#465, usnistgov#475 * Catalog metaschema and SP800-53 catalog adjustments renaming 'subcontrol' to 'control' per Issue usnistgov#473 * Refactored metaschemas to avoid definition clashes; more/better Schematron to detect such clashes * Adding new module now required by catalog and profile metaschemas * Revising profiles to be valid to newly revised schema (no more references to subcontrol elements only controls) * Bug fix in Metaschema Schematron * Delete FedRAMP_HIGH-baseline_profile.xml * Delete FedRAMP_LOW-baseline_profile.xml * Delete FedRAMP_MODERATE-baseline_profile.xml * Create temp.txt * Revised FedRAMP Profiles These files include revisions to the FedRAMP baselines, plus a small FedRAMP catalog that provides three subcontrols added by FedRAMP. * Delete temp.txt * moved updated fedramp content to correct location * New and improved FedRAMP profiles * Repaired broken markdown conversion; added missing title content to FedRAMP catalog * add note about b -> strong and i -> em (usnistgov#9) * Changed inline markup in FedRAMP profiles for lossless conversion * One more adjustment in Markdown->XML conversion (images) * One more time (cleaning up cleanup)
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Jan 25, 2023
* Schematron now reports duplicate definitions in a Metaschema as an error: see usnistgov#465, usnistgov#475 * Catalog metaschema and SP800-53 catalog adjustments renaming 'subcontrol' to 'control' per Issue usnistgov#473 * Refactored metaschemas to avoid definition clashes; more/better Schematron to detect such clashes * Adding new module now required by catalog and profile metaschemas * Revising profiles to be valid to newly revised schema (no more references to subcontrol elements only controls) * Bug fix in Metaschema Schematron * Delete FedRAMP_HIGH-baseline_profile.xml * Delete FedRAMP_LOW-baseline_profile.xml * Delete FedRAMP_MODERATE-baseline_profile.xml * Create temp.txt * Revised FedRAMP Profiles These files include revisions to the FedRAMP baselines, plus a small FedRAMP catalog that provides three subcontrols added by FedRAMP. * Delete temp.txt * moved updated fedramp content to correct location * New and improved FedRAMP profiles * Repaired broken markdown conversion; added missing title content to FedRAMP catalog * add note about b -> strong and i -> em (#9) * Changed inline markup in FedRAMP profiles for lossless conversion * One more adjustment in Markdown->XML conversion (images) * One more time (cleaning up cleanup)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addressing #473:
subcontrol
has been replaced bycontrol
everywhere in SP800-53.Remaining to do (at time of writing): adjusting profile and higher models to address controls only, never subcontrols.
Also in this PR, an adjustment to the Metaschema Schematron, see #465, #475 - overriding declarations are now detected and reported as errors.
All Submissions:
Changes to Core Features: