Skip to content

Commit defe67e

Browse files
aj-stein-nistaj-stein-nist
authored
Mapping model relocation 1/2: delete from develop (#1850)
* Remove mapping from modules config. * Delete mapping model from develop to move to feature branch.
1 parent 40e7e97 commit defe67e

File tree

5 files changed

+0
-211
lines changed

5 files changed

+0
-211
lines changed

‎build/ci-cd/config/metaschema‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ src/metaschema/oscal_ssp_metaschema.xml|xml,json|xml,json|xml,json
77
src/metaschema/oscal_poam_metaschema.xml|xml,json|xml,json|xml,json
88
src/metaschema/oscal_assessment-plan_metaschema.xml|xml,json|xml,json|xml,json
99
src/metaschema/oscal_assessment-results_metaschema.xml|xml,json|xml,json|xml,json
10-
src/metaschema/oscal_mapping_metaschema.xml|xml,json|xml,json|xml,json

‎src/metaschema/oscal_catalog_metaschema.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
</remarks>
1818
<import href="oscal_control-common_metaschema.xml"/>
1919
<import href="oscal_metadata_metaschema.xml"/>
20-
<import href="oscal_mapping-common_metaschema.xml"/>
2120
<define-assembly name="catalog">
2221
<formal-name>Catalog</formal-name>
2322
<description>A structured, <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#catalog">organized collection</a> of control information.</description>
@@ -212,23 +211,6 @@
212211
<assembly ref="part" max-occurs="unbounded">
213212
<group-as name="parts" in-json="ARRAY"/>
214213
</assembly>
215-
<define-assembly name="mapping">
216-
<formal-name>Mapping</formal-name>
217-
<description>A mapping between the containing control and another
218-
resource.</description>
219-
<define-flag name="uuid" as-type="uuid" required="yes">
220-
<formal-name>Mapping Identifier</formal-name>
221-
<description>The unique identifier for the mapping.</description>
222-
</define-flag>
223-
<model>
224-
<assembly ref="mapping-resource-reference" min-occurs="1">
225-
<use-name>target-resource</use-name>
226-
</assembly>
227-
<assembly ref="map" min-occurs="1" max-occurs="unbounded">
228-
<group-as name="maps" in-json="ARRAY"/>
229-
</assembly>
230-
</model>
231-
</define-assembly>
232214
<assembly ref="control" max-occurs="unbounded">
233215
<group-as name="controls" in-json="ARRAY"/>
234216
</assembly>

‎src/metaschema/oscal_complete_metaschema.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<p>This format represents a combination of all of the OSCAL models.</p>
1616
</remarks>
1717
<import href="oscal_catalog_metaschema.xml"/>
18-
<import href="oscal_mapping_metaschema.xml"/>
1918
<import href="oscal_profile_metaschema.xml"/>
2019
<import href="oscal_component_metaschema.xml"/>
2120
<import href="oscal_ssp_metaschema.xml"/>

‎src/metaschema/oscal_mapping-common_metaschema.xml‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎src/metaschema/oscal_mapping_metaschema.xml‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)