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

Workaround maven.restlet.org service cert expiry. #1602

Merged
merged 1 commit into from
Jan 9, 2023

Conversation

aj-stein-nist
Copy link
Contributor

Committer Notes

This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

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 website](https://pages.nist.gov/metaschema) and readme documentation affected by the changes you made? Changes to the website can be made in the website/content directory of your branch.

@aj-stein-nist aj-stein-nist self-assigned this Jan 6, 2023
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1
@aj-stein-nist aj-stein-nist force-pushed the chore-fix-restlet-maven-cert-workaround branch from 6ae4359 to 862df17 Compare January 6, 2023 20:39
@aj-stein-nist aj-stein-nist changed the base branch from develop to main January 6, 2023 20:40
@aj-stein-nist
Copy link
Contributor Author

@david-waltermire-nist as you had requested I pointed this at main and we will rebase develop once this is reviewed/merged or shortly thereafter, correct?

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.

Thanks!

@david-waltermire david-waltermire merged commit 7db6381 into main Jan 9, 2023
@david-waltermire david-waltermire deleted the chore-fix-restlet-maven-cert-workaround branch January 9, 2023 19:28
aj-stein-nist added a commit that referenced this pull request Apr 4, 2023
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1
aj-stein-nist added a commit that referenced this pull request Apr 4, 2023
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1
aj-stein-nist added a commit that referenced this pull request Apr 14, 2023
* Update metaschema for current datatype regexes for #1703.

* Back-port Metaschema XSD relocation.

As part of the OSCAL build process, we validate the structure of the
metaschema definitions of the OSCAL models themselves against the schema
of Metaschema definitions XSD from the metaschema repo. Recently, a path
update was fixed in the OSCAL develop branch but not in the release-1.0
branch or main because these changes occurred after 1.0.4 publication.
The files were relocated and reorganized. This adjustment must be made
to account for that.

Pull release/main back into develop should be minor and a rebase may not
be necessary. If so, we will adjust accordingly. In develop, see This
commit:

84d2d46

* Workaround maven.restlet.org service cert expiry. (#1602)

This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1

* Update metaschema submodule again.
aj-stein-nist added a commit to galtm/OSCAL that referenced this pull request Sep 28, 2023
This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1
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.

2 participants