Skip to content
This repository has been archived by the owner on Dec 12, 2023. It is now read-only.

OSCAL 1.0.0-rc2 annotation changed to prop #75

Merged
merged 4 commits into from
May 10, 2021
Merged

Conversation

GaryGapinski
Copy link
Collaborator

This PR changes all occurrences of <annotation> to <prop> in the Schematron, XSpec, FedRAMP extensions, and FedRAMP value constraints.

The XSpec unit tests had no failures.

Applying validate_with_schematron.sh to src/templates/ssp/xml/FedRAMP-SSP-OSCAL-Template.xml shows 22 differences. Results (master branch vs 1.0.0-rc2) in
svrl.zip.

By the way, the several FedRAMP-SSP-OSCAL-Template.xml differ in version:

./oscal/src/release/content-upgrade/FedRAMP-SSP-OSCAL-Template.xml
      <oscal-version>1.0-Milestone3</oscal-version>
            <oscal-version>1.0-Milestone3</oscal-version>
            <oscal-version>1.0-Milestone3</oscal-version>
./src/templates/ssp/xml/FedRAMP-SSP-OSCAL-Template.xml
      <oscal-version>1.0.0-rc2</oscal-version>
            <oscal-version>1.0.0-rc2</oscal-version>
./resources/validations/test/demo/FedRAMP-SSP-OSCAL-Template.xml
      <oscal-version>1.0-Milestone3</oscal-version>
            <oscal-version>1.0-Milestone3</oscal-version>
            <oscal-version>1.0-Milestone3</oscal-version>
./templates/ssp/xml/FedRAMP-SSP-OSCAL-Template.xml
      <oscal-version>1.0.0-rc2</oscal-version>
            <oscal-version>1.0.0-rc2</oscal-version>

Copy link
Member

@danielnaab danielnaab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, I just found a few "a / an" issues from the rename.

resources/xml/FedRAMP_extensions.xml Outdated Show resolved Hide resolved
resources/xml/FedRAMP_extensions.xml Outdated Show resolved Hide resolved
resources/xml/FedRAMP_extensions.xml Outdated Show resolved Hide resolved
GaryGapinski and others added 3 commits May 10, 2021 12:16
Co-authored-by: Daniel Naab <daniel.naab@gsa.gov>
Co-authored-by: Daniel Naab <daniel.naab@gsa.gov>
Co-authored-by: Daniel Naab <daniel.naab@gsa.gov>
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@GaryGapinski GaryGapinski merged commit e43427c into master May 10, 2021
@GaryGapinski GaryGapinski deleted the 1.0.0-rc2 branch May 10, 2021 16:32
@github-actions
Copy link

XSpec Test Results

  1 files  ±0    2 suites  ±0   0s ⏱️ ±0s
43 tests ±0  43 ✔️ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit e43427c. ± Comparison against base commit e43427c.

@mike-stern mike-stern linked an issue May 19, 2021 that may be closed by this pull request
ohsh6o pushed a commit that referenced this pull request May 27, 2021
Updated Rev 4 baselines to RC1 syntax
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants