Skip to content
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

Update metaschema submodule for usnistgov/OSCAL#1454. #1455

Merged

Conversation

aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Sep 14, 2022

Committer Notes

Closes #1454.

Fixes upstream issue to revert workarounds in usnistgov/oscal-content#139 and unblock ginger-anderson/CISControls_OSCAL#1.

All Submissions:

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

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.

@aj-stein-nist
Copy link
Contributor Author

OK, @david-waltermire-nist, with commit 1ee03d5 this looks good to go. Ready for review.

Compton-US
Compton-US previously approved these changes Sep 15, 2022
While working on usnistgov#1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
@aj-stein-nist aj-stein-nist force-pushed the 1454-simpletype-generation-issue branch from 8d692ed to 131941e Compare September 19, 2022 15:35
@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist ok Dave, I wrapped in the updated metaschema submodule code from usnistgov/metaschema#234 you approved this morning. Had some rebase issues ordering correctly and eventually just ditched the previous submodule update commit locally.

We should be good now!

Copy link
Contributor

@david-waltermire david-waltermire 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!

@aj-stein-nist aj-stein-nist merged commit 0972890 into usnistgov:develop Sep 19, 2022
aj-stein-nist added a commit that referenced this pull request Oct 18, 2022
* Update metaschema submodule for #1454.

* Update obsolete GCN FR OSCAL article link

While working on #1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
david-waltermire pushed a commit that referenced this pull request Oct 31, 2022
* Update metaschema submodule for #1454.

* Update obsolete GCN FR OSCAL article link

While working on #1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jan 10, 2023
* Update metaschema submodule for usnistgov#1454.

* Update obsolete GCN FR OSCAL article link

While working on usnistgov#1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Feb 6, 2023
* Update metaschema submodule for usnistgov#1454.

* Update obsolete GCN FR OSCAL article link

While working on usnistgov#1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jun 29, 2023
* Update metaschema submodule for usnistgov#1454.

* Update obsolete GCN FR OSCAL article link

While working on usnistgov#1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
aj-stein-nist added a commit to aj-stein-nist/OSCAL-forked that referenced this pull request Jul 10, 2023
* Update metaschema submodule for usnistgov#1454.

* Update obsolete GCN FR OSCAL article link

While working on usnistgov#1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
aj-stein-nist added a commit to galtm/OSCAL that referenced this pull request Sep 28, 2023
* Update metaschema submodule for usnistgov#1454.

* Update obsolete GCN FR OSCAL article link

While working on usnistgov#1454, this link appears to have changed
on the GCN news site, so we update. More info in failed build here.

https://github.com/usnistgov/OSCAL/actions/runs/3054991503

Additionaly we formatted it back down to a conventional Markdown link.
Previously it was an inline <a/> with data-proofer-ignore='yes' attribute
and it was/is unclear why that was done. No conclusive evidence found
with git blamen on a call with Dave.

Be forewarned: if you found this commit to understand, you have likely
gone too far.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OSCAL Develop Branch SimpleType Type XSD Generation Missing
3 participants