streamlined bomLink regex

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

schema/bom-1.5.xsd

@@ -63,7 +63,7 @@ limitations under the License.
         </xs:annotation>
         <xs:restriction base="xs:anyURI">
             <!-- part of the pattern is based on `bom.serialNumber`'s pattern -->
-            <xs:pattern value="urn:cdx:([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})/[1-9][0-9]*"/>
+            <xs:pattern value="urn:cdx:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/[1-9][0-9]*"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="bomLinkElementType">
@@ -75,7 +75,7 @@ limitations under the License.
         </xs:annotation>
         <xs:restriction base="xs:anyURI">
             <!-- part of the pattern is based on `bom.serialNumber`'s pattern -->
-            <xs:pattern value="urn:cdx:([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})/[1-9][0-9]*#.+"/>
+            <xs:pattern value="urn:cdx:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/[1-9][0-9]*#.+"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="bomLinkType">