Merge branch 'develop' into 1913-relax-service-component-protocol-constraint

Author: iMichaela

src/metaschema/oscal_implementation-common_metaschema.xml

@@ -279,17 +279,17 @@
       </define-assembly>
       <define-assembly name="port-range">
             <formal-name>Port Range</formal-name>
-            <description>Where applicable this is the IPv4 port range on which the service operates.</description>
+            <description>Where applicable this is the transport layer protocol port range an IPv4-based or IPv6-based service uses.</description>
             <define-flag name="start" as-type="non-negative-integer">
                   <formal-name>Start</formal-name>
-                  <description>Indicates the starting port number in a port range</description>
+                  <description>Indicates the starting port number in a port range for a transport layer protocol</description>
                   <remarks>
                         <p>Should be a number within a permitted range</p>
                   </remarks>
             </define-flag>
             <define-flag name="end" as-type="non-negative-integer">
                   <formal-name>End</formal-name>
-                  <description>Indicates the ending port number in a port range</description>
+                  <description>Indicates the ending port number in a port range for a transport layer protocol</description>
                   <remarks>
                         <p>Should be a number within a permitted range</p>
                   </remarks>

src/metaschema/oscal_ssp_metaschema.xml

@@ -633,14 +633,6 @@
         <key-field target="@href"/>
       </index-has-key>
 
-      <!-- References to components of @type="software" -->
-      <index name="index-system-implementation-component-uuid-software" target="component[@type='service']">
-        <key-field target="@uuid"/>
-      </index>
-      <index-has-key name="index-system-implementation-component-uuid-software" target="component[@type='service']/link[@rel='provided-by']">
-        <key-field target="@href"/>
-      </index-has-key>
-
       <!-- TODO: check that prop names are defined -->
       <allowed-values target="(component | inventory-item)/prop[has-oscal-namespace('http://csrc.nist.gov/ns/oscal') and @name='allows-authenticated-scan']/@value">
         <enum value="yes">The component allows an authenticated scan.</enum>