Skip to content

Adjustments to align with Metaschema schema bug fixes#1805

Merged
aj-stein-nist merged 1 commit intousnistgov:release-1.0from
david-waltermire:fix-invalid-metaschema
Jun 27, 2023
Merged

Adjustments to align with Metaschema schema bug fixes#1805
aj-stein-nist merged 1 commit intousnistgov:release-1.0from
david-waltermire:fix-invalid-metaschema

Conversation

@david-waltermire
Copy link
Contributor

Committer Notes

The next Metaschema release will corrects a bug that allowed inline field and flag definitions to use use-name. This was not intended, but has been used in OSCAL. To ensure alignment with this Metaschema change, this PR refactors out the need to use use-name in the two places where it is used.

This PR targets the release-1.0 branch, but should also be applied to develop.

All Submissions:

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • [ ] Have you written new tests for your core changes, as applicable?
  • [ ] Have you included examples of how to use your new feature(s)?
  • [ ] Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

@david-waltermire david-waltermire changed the base branch from main to release-1.0 June 5, 2023 22:50
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for catching this.

Copy link
Contributor

@wendellpiez wendellpiez left a comment

Choose a reason for hiding this comment

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

Yes, by all means, thank you.

@aj-stein-nist aj-stein-nist merged commit e81ce5f into usnistgov:release-1.0 Jun 27, 2023
@aj-stein-nist aj-stein-nist self-assigned this Jun 28, 2023
@aj-stein-nist aj-stein-nist added this to the v1.1.0 milestone Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants