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

Script and dependency fixes for v1.1.0 content updates #1874

Merged
merged 2 commits into from
Aug 7, 2023

Conversation

aj-stein-nist
Copy link
Contributor

@aj-stein-nist aj-stein-nist commented Aug 6, 2023

Committer Notes

This PR corrects some relative paths in oscal-profile-resolve.sh and restores a Maven POM dependency file for usnistgov/oscal-content#204. It will be needed to further that work.

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? These changes are not part of core.
  • Have you included examples of how to use your new feature(s)? N/A
  • 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.

Add this back as part of sprint work to build new Makefile(s) and recreate profile resolution tooling for local and GHA CI/CD for usnistgov/oscal-content#204.
This was removed in site migration work and did not appear to be relocated, as determined during the course of usnistgov/oscal-content#204. We can rely on the metaschema-xslt project, but given OSCAL has the profile resolver tool committed in its repo tree, it stands to reason to rely on its own independent Maven POM file, even if now redundant, as they may diverge in the future.
@aj-stein-nist aj-stein-nist requested a review from a team August 6, 2023 19:06
@aj-stein-nist aj-stein-nist self-assigned this Aug 6, 2023
@aj-stein-nist aj-stein-nist changed the title Chore fixes v1.1.0 content updates Script and dependency fixes for v1.1.0 content updates Aug 7, 2023
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.

LGTM - lemme know

@aj-stein-nist aj-stein-nist merged commit 64e130f into develop Aug 7, 2023
1 check passed
@aj-stein-nist aj-stein-nist deleted the chore-fixes-v1.1.0-content-updates branch August 7, 2023 19:33
aj-stein-nist added a commit that referenced this pull request Sep 12, 2023
* Correct relative path to previous Maven POM dep file

Add this back as part of sprint work to build new Makefile(s) and recreate profile resolution tooling for local and GHA CI/CD for usnistgov/oscal-content#204.

* Add back pom.xml for Maven deps

This was removed in site migration work and did not appear to be relocated, as determined during the course of usnistgov/oscal-content#204. We can rely on the metaschema-xslt project, but given OSCAL has the profile resolver tool committed in its repo tree, it stands to reason to rely on its own independent Maven POM file, even if now redundant, as they may diverge in the future.
Arminta-Jenkins-NIST pushed a commit that referenced this pull request Sep 12, 2023
* Correct relative path to previous Maven POM dep file

Add this back as part of sprint work to build new Makefile(s) and recreate profile resolution tooling for local and GHA CI/CD for usnistgov/oscal-content#204.

* Add back pom.xml for Maven deps

This was removed in site migration work and did not appear to be relocated, as determined during the course of usnistgov/oscal-content#204. We can rely on the metaschema-xslt project, but given OSCAL has the profile resolver tool committed in its repo tree, it stands to reason to rely on its own independent Maven POM file, even if now redundant, as they may diverge in the future.
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.

2 participants