Skip to content

Commit

Permalink
Update OSCAL models to v1.1.2 for #234. (#235)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aj-stein-nist
aj-stein-nist committed Feb 1, 2024
1 parent a758cce commit e659797
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion oscal
Submodule oscal updated 41 files
+8 −12 .github/CODEOWNERS
+8 −17 .github/workflows/issue-triage.yml
+3 −3 .github/workflows/periodic.yml
+2 −2 .github/workflows/release.yml
+3 −3 .github/workflows/status.yml
+5 −2 build/markdown-link-check.json
+1 −1 build/metaschema-xslt
+1 −1 build/pom.xml
+80 −0 decisions/0007-implementation-agnostic-tests.md
+65 −0 decisions/0008-oscal-content-management.md
+46 −0 decisions/0009-tutorials-system-lifecycle.md
+1 −1 src/metaschema/oscal_assessment-common_metaschema.xml
+1 −1 src/metaschema/oscal_assessment-plan_metaschema.xml
+1 −1 src/metaschema/oscal_assessment-results_metaschema.xml
+4 −2 src/metaschema/oscal_catalog_metaschema.xml
+1 −1 src/metaschema/oscal_complete_metaschema.xml
+1 −1 src/metaschema/oscal_component_metaschema.xml
+1 −1 src/metaschema/oscal_implementation-common_metaschema.xml
+1 −1 src/metaschema/oscal_metadata_metaschema.xml
+1 −1 src/metaschema/oscal_poam_metaschema.xml
+1 −1 src/metaschema/oscal_profile_metaschema.xml
+3 −1 src/metaschema/oscal_ssp_metaschema.xml
+0 −241 src/specifications/profile-resolution/metaschema-datatypes.xsd
+42 −0 src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-multiple-children_catalog.xml
+6 −6 ...ecifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml
+33 −0 ...ications/profile-resolution/profile-resolution-examples/output-expected/without-parent_profile_RESOLVED.xml
+18 −0 src/specifications/profile-resolution/profile-resolution-examples/without-parent_profile.xml
+1 −1 src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec
+2 −2 src/specifications/profile-resolution/profile-resolution-specml.xml
+1 −1 src/specifications/profile-resolution/profile-resolution-unit-tests.xml
+1 −1 src/specifications/profile-resolution/readme.md
+1 −1 src/specifications/profile-resolution/resolution-testing.xml
+472 −0 src/specifications/profile-resolution/spec-tester.py
+17 −0 src/specifications/profile-resolution/spec-tests.json
+1 −1 src/specifications/profile-resolution/unit-tests.xsd
+8 −20 src/utils/resolver-pipeline/select-or-custom-merge.xsl
+1 −1 src/utils/resolver-pipeline/testing/1_selected/resource-media-type.xml
+1 −1 src/utils/resolver-pipeline/testing/1_selected/resource-multiple-rlinks.xml
+14 −200 src/utils/resolver-pipeline/testing/1_selected/select.xspec
+2 −2 src/utils/resolver-pipeline/testing/pathological-profile.xml
+1 −1 versioning-and-branching.md

0 comments on commit e659797

Please sign in to comment.