Profile resolver: Compatibility with Saxon 10 and 11 #1685
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace document-uri with base-uri. Saxon 10 and 11 can return different values from document-uri() function. For compatibility and to avoid errors when document-uri() returns empty with Saxon 11, use base-uri() instead.
9 tasks
galtm
changed the title
aj-stein-nist
approved these changes
Mar 2, 2023
Contributor
aj-stein-nist
left a comment
aj-stein-nist
left a comment
There was a problem hiding this comment.
Looks good, thanks so much for your prompt turnaround given the feedback requested. I have not merged this yet, but will shortly as I do some higher-level integration testing "by hand" so to speak.
7 tasks
This was referenced Mar 10, 2023
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Jun 29, 2023
Replace document-uri with base-uri. Saxon 10 and 11 can return different values from document-uri() function. For compatibility and to avoid errors when document-uri() returns empty with Saxon 11, use base-uri() instead.
aj-stein-nist
pushed a commit
to aj-stein-nist/OSCAL-forked
that referenced
this pull request
Jul 10, 2023
Replace document-uri with base-uri. Saxon 10 and 11 can return different values from document-uri() function. For compatibility and to avoid errors when document-uri() returns empty with Saxon 11, use base-uri() instead.
aj-stein-nist
pushed a commit
to galtm/OSCAL
that referenced
this pull request
Sep 28, 2023
Replace document-uri with base-uri. Saxon 10 and 11 can return different values from document-uri() function. For compatibility and to avoid errors when document-uri() returns empty with Saxon 11, use base-uri() instead.
aj-stein-nist
pushed a commit
that referenced
this pull request
Sep 28, 2023
Replace document-uri with base-uri. Saxon 10 and 11 can return different values from document-uri() function. For compatibility and to avoid errors when document-uri() returns empty with Saxon 11, use base-uri() instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Committer Notes
This PR addresses issue #1629 by replacing usage of
document-uriwithbase-uri. Thedocument-urifunction is known to return different results in Saxon 10 vs. 11. Usingbase-uriremoves a difference in the XSLT profile resolver's behavior between Saxon 10 and 11.Unlike #1639, this PR builds on the head of the develop branch and does not include code from #1596 or #1549.
All Submissions:
(Note: Profile resolver compatibility with Saxon 11 (on top of other unmerged PRs) #1639 has the same update, but mixed with other code. This pull request isolates the code for Saxon 11 compatibility.)
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 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.Testing Done
.xspecfiles in thetesting/directory) with Oxygen 24.1, which uses Saxon 10.src/specifications/profile-resolution/profile-resolution-examples. Diff'd the results, and they are the same except time stamps. The profiles that error out (e.g.,broken_profile.xml) behave the same way in both Oxygen versions.