Merge branch 'master' into feat/enum-labels-for-spdx.schema.json

Author: stevespringett

.github/workflows/test_java.yml

@@ -18,7 +18,7 @@ defaults:
 permissions: {}
 
 jobs:
-  test:
+  test_java:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout

.github/workflows/test_js.yml

@@ -20,7 +20,7 @@ defaults:
 permissions: {}
 
 jobs:
-  test:
+  test_js:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:

.github/workflows/test_php.yml

@@ -20,7 +20,7 @@ defaults:
 permissions: {}
 
 jobs:
-  test:
+  test_php:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:

.github/workflows/test_proto.yml

@@ -20,7 +20,7 @@ defaults:
 permissions: {}
 
 jobs:
-  test:
+  test_proto:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:

schema/bom-1.6.schema.json

@@ -536,7 +536,7 @@
       "description": "Identifier for referable and therefore interlinkable elements.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
       "type": "string",
       "minLength": 1,
-      "$comment": "TODO (breaking change): add a format constraint that prevents the value from staring with 'urn:cdx:'"
+      "$comment": "TODO (breaking change): add a format constraint that prevents the value from starting with 'urn:cdx:'"
     },
     "refLinkType": {
       "description": "Descriptor for an element identified by the attribute 'bom-ref' in the same BOM document.\nIn contrast to `bomLinkElementType`.",
@@ -1161,7 +1161,7 @@
         "contentType": {
           "type": "string",
           "title": "Content-Type",
-          "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents.\n [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
+          "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plain text documents.\n [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
           "default": "text/plain",
           "examples": [
             "text/plain",

schema/bom-1.6.xsd

@@ -973,7 +973,7 @@ limitations under the License.
                         <xs:documentation>
                             Specifies the format and nature of the data being attached, helping systems correctly
                             interpret and process the content. Common content type examples include `application/json`
-                            for JSON data and `text/plain` for plan text documents.
+                            for JSON data and `text/plain` for plain text documents.
                             RFC 2045 section 5.1 outlines the structure and use of content types. For a comprehensive
                             list of registered content types, refer to the IANA media types registry at
                             https://www.iana.org/assignments/media-types/media-types.xhtml.

schema/bom-1.7.schema.json

@@ -555,7 +555,7 @@
       "description": "Identifier for referable and therefore interlinkable elements.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links.",
       "type": "string",
       "minLength": 1,
-      "$comment": "TODO (breaking change): add a format constraint that prevents the value from staring with 'urn:cdx:'"
+      "$comment": "TODO (breaking change): add a format constraint that prevents the value from starting with 'urn:cdx:'"
     },
     "refLinkType": {
       "title": "BOM Reference",
@@ -1248,7 +1248,7 @@
         "contentType": {
           "type": "string",
           "title": "Content-Type",
-          "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents.\n [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
+          "description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plain text documents.\n [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
           "default": "text/plain",
           "examples": [
             "text/plain",

schema/bom-1.7.xsd

@@ -1204,7 +1204,7 @@ limitations under the License.
                         <xs:documentation>
                             Specifies the format and nature of the data being attached, helping systems correctly
                             interpret and process the content. Common content type examples include `application/json`
-                            for JSON data and `text/plain` for plan text documents.
+                            for JSON data and `text/plain` for plain text documents.
                             RFC 2045 section 5.1 outlines the structure and use of content types. For a comprehensive
                             list of registered content types, refer to the IANA media types registry at
                             https://www.iana.org/assignments/media-types/media-types.xhtml.

schema/cryptography-defs.json

@@ -418,7 +418,7 @@
         {
           "standard": [
             {
-              "name": "RFC 5297",
+              "name": "RFC5297",
               "url": "https://doi.org/10.17487/RFC5297"
             }
           ],
@@ -723,7 +723,7 @@
       "family": "ML-DSA",
       "standard": [
         {
-          "name": "FIPS 204",
+          "name": "FIPS204",
           "url": "https://doi.org/10.6028/NIST.FIPS.204"
         }
       ],
@@ -742,7 +742,7 @@
       "family": "SLH-DSA",
       "standard": [
         {
-          "name": "FIPS 205",
+          "name": "FIPS205",
           "url": "https://doi.org/10.6028/NIST.FIPS.205"
         }
       ],
@@ -811,7 +811,7 @@
       "family": "ML-KEM",
       "standard": [
         {
-          "name": "FIPS 203",
+          "name": "FIPS203",
           "url": "https://doi.org/10.6028/NIST.FIPS.203"
         }
       ],

schema/cryptography-defs.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "http://cyclonedx.org/schema/cryptography-defs.schema.json",
-  "$comment": "2026-02-19T23:43:11Z",
+  "$comment": "2026-02-26T14:12:39Z",
   "title": "Cryptographic Algorithm Family Definitions",
   "description": "Enumerates cryptographic algorithm families and their specific metadata.",
   "type": "object",