Skip to content

Commit

Permalink
Update merge-keep profile resolution examples. (#22)
Browse files Browse the repository at this point in the history 
These are essentially identical, since keep is the default.
  • Loading branch information
@bradh @wendellpiez
bradh authored and wendellpiez committed Jan 7, 2020
1 parent ae999b4 commit 9f7a33b
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 8 deletions.
56 changes: 48 additions & 8 deletions ...tion/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
id="merge-implicit-keep_profile-RESOLVED">
<metadata>
<title>Test Profile</title>
<last-modified>2019-10-13T13:41:58.548-04:00</last-modified>
<version>1.0</version>
<oscal-version>1.0-MR2</oscal-version>
<prop name="resolution-timestamp">2019-12-10T15:21:21.893-05:00</prop>
<link rel="resolution-source" href="../merge-implicit-keep_profile.xml">Test Profile</link>
</metadata>
<metadata>
<title>Test Profile</title>
<last-modified>2019-10-13T13:41:58.548-04:00</last-modified>
<version>1.0</version>
<oscal-version>1.0-MR2</oscal-version>
<prop name="resolution-timestamp">2019-12-10T15:21:21.893-05:00</prop>
<link rel="resolution-source" href="../merge-implicit-keep_profile.xml">Test Profile</link>
</metadata>
<group>
<title>Group A of C</title>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
</group>
<group>
<title>Group B of C</title>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
</group>
<group>
<title>Group A of C</title>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
</group>
<group>
<title>Group B of C</title>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
</group>
</catalog>
40 changes: 40 additions & 0 deletions ...le-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,44 @@
<prop name="resolution-timestamp">2019-12-10T15:21:22.039-05:00</prop>
<link rel="resolution-source" href="../merge-keep_profile.xml">Test Profile</link>
</metadata>
<group>
<title>Group A of C</title>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
</group>
<group>
<title>Group B of C</title>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
</group>
<group>
<title>Group A of C</title>
<control id="a1">
<title>Control A1</title>
<prop name="place">first</prop>
<part name="statement" id="a1-stmt">
<p>A1 aaaaa aaaaaaaaaa</p>
</part>
</control>
</group>
<group>
<title>Group B of C</title>
<control id="b1">
<title>Control B1</title>
<prop name="place">first</prop>
<part name="statement" id="b1-stmt">
<p>B1 bbbb bbbbbbb.</p>
</part>
</control>
</group>
</catalog>

0 comments on commit 9f7a33b

Please sign in to comment.