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

Improved alternative 'resolve-entities.xsl' utility XSLT #1976

Merged

Conversation

wendellpiez
Copy link
Contributor

Committer Notes

With an enhancement to current functionality, this PR is intended mainly as a demo/learning exercise.

A new XSLT provides the same functionality for normalization as the utility XSLT resolve-entities.xsl, only much more concisely, by using XSLT 3.0 features.

Additionally, an XSpec provided shows the XSLT's functionality - as well as demonstrating the delta with the old (XSLT 1.0) stylesheet. (Switch the @stylesheet pointer at the top of the XSpec. It will run and show a couple of failed tests.)

Assuming we are using an up-to-date Saxon, replacing the old XSLT with the new one (should we wish to do this) would be a drop-in. If wanted, we could do this before merging the PR.

But since the XSLT affects the presentation of the RESOLVED variant (normalized) metaschemas, we should run a build first and examine results.

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.

dependabot bot and others added 26 commits September 28, 2023 10:47
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@f43a0e5...3df4ab1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@3df4ab1...8ade135)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [build/metaschema-xslt](https://github.com/usnistgov/metaschema-xslt) from `034e92b` to `bd4359a`.
- [Commits](usnistgov/metaschema-xslt@034e92b...bd4359a)

---
updated-dependencies:
- dependency-name: build/metaschema-xslt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Based on the content of the catalog whose controls are being
imported, the prop names should be "label" instead of "place"
and the a1 statement paragraph should include <insert>.

Also, remove a debugging message.
Unselected parent could have multiple children that
are selected, so data type of template must accommodate
multiple elements.
* Deleted duplicate `metaschema_datatypes` file
* Added spec test adr and prototype spec test file
* Spec test harness and minimal example
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@d7906e4...60a0d83)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@5e21ff4...8f152de)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…stgov#1953)

Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.6.1.
- [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@8ade135...b4ffde6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [build/metaschema-xslt](https://github.com/usnistgov/metaschema-xslt) from `bd4359a` to `7d9fbfa`.
- [Commits](usnistgov/metaschema-xslt@bd4359a...7d9fbfa)

---
updated-dependencies:
- dependency-name: build/metaschema-xslt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This ADR documents the team's decision regarding the simplified system lifecycle to be used in the tutorials.
* Flatten codeowners

* Update CODEOWNERS with feedback from the team
…snistgov#1949  (usnistgov#1952)

* Two additional allowed values for catalog/group/part/@name and catalog/group/control/part/@name

* aligned the description of group/part@name='statement' and control/part@name='statement'

* Fixed typo in the oscal_ssp_metaschema and updated controversial constraint for group/part in oscal_catalog_metaschema

* Update src/metaschema/oscal_catalog_metaschema.xml

Fixed grammar.

Co-authored-by: Chris Compton <[email protected]>

---------

Co-authored-by: Iorga <[email protected]>
Co-authored-by: Chris Compton <[email protected]>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Remove with-parent-controls from XSLT profile resolver for usnistgov#1816.

* Remove profile resolver with-parent-controls tests for usnistgov#1816.
@wendellpiez wendellpiez requested a review from a team as a code owner January 23, 2024 18:27
Copy link
Contributor

@iMichaela iMichaela left a comment

Choose a reason for hiding this comment

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

All changes reviewed locally: make all completed successfully and all tests passed.

@iMichaela iMichaela merged commit 8988c9b into usnistgov:develop Mar 12, 2024
1 check passed
@iMichaela
Copy link
Contributor

PR was successfully merged via command line with:
Merging via command line

  1. Checked out a new branch and tested the changes locally.
git checkout -b wendellpiez-enhancement-metaschema-normalizer-fixup develop
git pull https://github.com/wendellpiez/OSCAL.git enhancement-metaschema-normalizer-fixup
  1. Merged the changes and pushed to develop branch.
git checkout develop
git merge --no-ff wendellpiez-enhancement-metaschema-normalizer-fixup
git push origin develop

@iMichaela
Copy link
Contributor

Completed.

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.

7 participants