Skip to content

Merging Control Mapping Model into develop branch#2174

Merged
iMichaela merged 22 commits intodevelopfrom
prototype2-mapping-model
Dec 10, 2025
Merged

Merging Control Mapping Model into develop branch#2174
iMichaela merged 22 commits intodevelopfrom
prototype2-mapping-model

Conversation

@iMichaela
Copy link
Contributor

@iMichaela iMichaela commented Dec 9, 2025 •
edited
Loading

Committer Notes

Merging Control Mapping Model into develop branch in preparation of the OSCAL minor release 1.2.0

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 the OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the OSCAL-Pages and OSCAL_Reference repositories.

aj-stein-nist and others added 22 commits December 9, 2025 11:15
@aj-stein-nist
Revert "Mapping model relocation 1/2: delete from develop (#1850)"
c404f58 
This reverts commit defe67e.
@aj-stein-nist
Bump mapping schema to match 'current' version.
0c60053
checkpoint - initial add of provenance.
67e4f52
Include provenance in mapping model.
93e0a98
Adjust assembly.
ee3370e
Correct assembly location.
978df39
Use correct case
141456d
Resolved conflicts and rebased to develop.
63f8ac4
@iMichaela
Reviews of the mapping model related declarations.
d44865a
@nikitawootten-nist
Copy with-id field from profile metaschema
7ab7d10
@iMichaela
Updated schema-version in mapping-related metaschema files.
aa66a34
@iMichaela
Added no-relation relationship for alignment with NIST IR 8477.
0730d9b
@iMichaela
Fixed typo in oscal_mapping-common_metasckema.xml
b421479
@iMichaela
Fixed OSCAL Reference erorrs due to assembly and flag definitions not…
de8bc65 
… available in the imports.
@canb227
Moved source and target gap summaries out of top-level and into mapping
82789dd
@canb227
Added provenance fields and flags to mapping as optional; Updated doc…
3d63732 
…umentation to reflect override behavior.
@canb227
Added props,links, and remarks to "provenance" and "mapping"
eb7ec50
@canb227
Overhauls confidence-score and makes it optional, and adds the new co…
12b43e8 
…verage field.
@canb227
Added "hybrid" as valid value in the "method" flag.
9bab7bb
@canb227
Added new optional "ns" element to mapping-resource, and allowed othe…
155eb28 
…r values in "type"
@canb227
Corrected use of <flag>to reference "coverage". Changed ordering of e…
d6acf7c 
…lements in "coverage" definition.
Updated the mapping-common metaschema definition file to eliminate do…
bca567c 
…uble definition of .
@iMichaela iMichaela requested a review from a team as a code owner December 9, 2025 16:20
@iMichaela iMichaela requested review from a team and removed request for a team December 9, 2025 16:21
@iMichaela
Copy link
Contributor Author

iMichaela commented Dec 9, 2025 •
edited
Loading

IMPORTANT NOTE: This PR is the result of the OSCAL Foundation's request to test the Controls Mapping Model at the OSCAL PlugFest on Dec 15, 2025. The PR submitted in preparation of such minor release. Due to time constraints, the PR is not addressing the merge profile resolution issue #2166 which will be addressed after the event.

Issue #2166 is one of the OF's work items for near future and requires a review of the specification, the resolver's implementation and of the test suit which exercises positive and negative unit tests.

The profile resolver tests, if ran, will return errors that are not breaking the build , when testing merge-combined functionality launched by usnistgov/OSCAL/src/utils/resolver-pipeline/testing/3_merged/merge.xspec.

For interested parties, returned errors are:

Tests for match=@opr:id template
ERROR in x:context (under 'Tests for match=@opr:id template'): Context is an empty sequence.
Error on line 12871 column 42 of merge-compiled.xsl:
  XTMM9000  Processing terminated by xsl:message at line 12871 in merge-compiled.xsl at template scenario9 on line 12810 column 83 of merge-compiled.xsl:  invoked by xsl:call-template at file: usnistgov/OSCAL/src/utils/resolver-pipeline/./testing/xspec/merge-compiled.xsl#73 at template main on line 30 column 41 of merge-compiled.xsl:  invoked by xsl:for-each at file: usnistgov/OSCAL/src/utils/resolver-pipeline/./testing/xspec/merge-compiled.xsl#46
at template main on line 30 column 41 of merge-compiled.xsl:
Processing terminated by xsl:message at line 12871 in merge-compiled.xsl

@rsherwood-nist rsherwood-nist self-assigned this Dec 10, 2025
rsherwood-nist
rsherwood-nist approved these changes Dec 10, 2025
View reviewed changes
Copy link

@rsherwood-nist rsherwood-nist left a comment

Choose a reason for hiding this comment

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

Approved

@iMichaela iMichaela merged commit 86e384f into develop Dec 10, 2025
1 check passed
@iMichaela iMichaela deleted the prototype2-mapping-model branch December 14, 2025 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rsherwood-nist rsherwood-nist rsherwood-nist approved these changes

Assignees

@rsherwood-nist rsherwood-nist

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@iMichaela @rsherwood-nist @aj-stein-nist @nikitawootten-nist @canb227