From c376eeb2a866a4db5773d9a9d2ffe0b8ad2abdb7 Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Sat, 20 Aug 2022 22:39:46 -0400
Subject: [PATCH] Add grouping construct to props for usnistgov/OSCAL#1064.
 (#1412)

---
 src/metaschema/oscal_metadata_metaschema.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/metaschema/oscal_metadata_metaschema.xml b/src/metaschema/oscal_metadata_metaschema.xml
index 59ede0c383..2ea0c03416 100644
--- a/src/metaschema/oscal_metadata_metaschema.xml
+++ b/src/metaschema/oscal_metadata_metaschema.xml
@@ -67,6 +67,7 @@
                 <key-field target="@name"/>
                 <key-field target="@ns"/>
                 <key-field target="@class"/>
+                <key-field target="@group"/>
                 <key-field target="@value"/>
             </is-unique>
             <index id="index-metadata-property-uuid" name="index-metadata-property-uuid" target=".//prop">
@@ -644,6 +645,13 @@
                 <p>A <code>class</code> can be used in validation rules to express extra constraints over named items of a specific <code>class</code> value.</p>
             </remarks>
         </define-flag>
+        <define-flag name="group" as-type="token">
+            <formal-name>Property Group</formal-name>
+            <description>An identifier for relating distinct sets of properties.</description>
+            <remarks>
+                <p>Different sets of properties may relate to separate contexts. Declare a group on a property to associate it with one or more other properties in a given context.</p>
+            </remarks>
+        </define-flag>
         <model>
             <field ref="remarks" in-xml="WITH_WRAPPER"/>
         </model>