Merge branch 'master' into bhe-cryptodefs

stevespringett · web-flow · commit c83d471dddd0 · 2026-03-05T15:21:48.000+01:00
diff --git a/docgen/json/templates/cyclonedx/base.html b/docgen/json/templates/cyclonedx/base.html
@@ -95,5 +95,6 @@ <h1>{{ title }}</h1>
 </footer>
 -->
 
+  <img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=ce3b481f-33a5-4c88-aaf1-00c8805f24d9" />
 </body>
 </html>
diff --git a/docgen/proto/templates/html.tmpl b/docgen/proto/templates/html.tmpl
@@ -569,5 +569,6 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
     </table>
 
 </div>
+    <img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=ce3b481f-33a5-4c88-aaf1-00c8805f24d9" />
   </body>
 </html>
diff --git a/docgen/xml/xs3p.xsl b/docgen/xml/xs3p.xsl
@@ -491,6 +491,7 @@
                });
                </xsl:text>
             </script>
+            <img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=ce3b481f-33a5-4c88-aaf1-00c8805f24d9" />
          </body>
       </html>
    </xsl:template>
diff --git a/schema/bom-1.6.schema.json b/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",
diff --git a/schema/bom-1.6.xsd b/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.
diff --git a/schema/bom-1.7.schema.json b/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",
diff --git a/schema/bom-1.7.xsd b/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.
diff --git a/schema/cryptography-defs.json b/schema/cryptography-defs.json
@@ -418,7 +418,7 @@
         {
           "standard": [
             {
-              "name": "RFC 5297",
+              "name": "RFC5297",
               "url": "https://doi.org/10.17487/RFC5297"
             }
           ],
@@ -708,7 +708,7 @@
       "family": "ML-DSA",
       "standard": [
         {
-          "name": "FIPS 204",
+          "name": "FIPS204",
           "url": "https://doi.org/10.6028/NIST.FIPS.204"
         }
       ],
@@ -727,7 +727,7 @@
       "family": "SLH-DSA",
       "standard": [
         {
-          "name": "FIPS 205",
+          "name": "FIPS205",
           "url": "https://doi.org/10.6028/NIST.FIPS.205"
         }
       ],
@@ -796,7 +796,7 @@
       "family": "ML-KEM",
       "standard": [
         {
-          "name": "FIPS 203",
+          "name": "FIPS203",
           "url": "https://doi.org/10.6028/NIST.FIPS.203"
         }
       ],
diff --git a/schema/cryptography-defs.schema.json b/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",
diff --git a/schema/spdx.schema.json b/schema/spdx.schema.json
diff --git a/tools/src/main/java/org/cyclonedx/tools/SpdxXsdGenerator.java b/tools/src/main/java/org/cyclonedx/tools/SpdxXsdGenerator.java
diff --git a/tools/src/test/js/json-schema-functional-tests.js b/tools/src/test/js/json-schema-functional-tests.js
diff --git a/tools/src/test/js/json-schema-lint-tests.js b/tools/src/test/js/json-schema-lint-tests.js

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@`
`418`	`418`	`{`
`419`	`419`	`"standard": [`
`420`	`420`	`{`
`421`		`- "name": "RFC 5297",`
	`421`	`+ "name": "RFC5297",`
`422`	`422`	`"url": "https://doi.org/10.17487/RFC5297"`
`423`	`423`	`}`
`424`	`424`	`],`
`@@ -708,7 +708,7 @@`
`708`	`708`	`"family": "ML-DSA",`
`709`	`709`	`"standard": [`
`710`	`710`	`{`
`711`		`- "name": "FIPS 204",`
	`711`	`+ "name": "FIPS204",`
`712`	`712`	`"url": "https://doi.org/10.6028/NIST.FIPS.204"`
`713`	`713`	`}`
`714`	`714`	`],`
`@@ -727,7 +727,7 @@`
`727`	`727`	`"family": "SLH-DSA",`
`728`	`728`	`"standard": [`
`729`	`729`	`{`
`730`		`- "name": "FIPS 205",`
	`730`	`+ "name": "FIPS205",`
`731`	`731`	`"url": "https://doi.org/10.6028/NIST.FIPS.205"`
`732`	`732`	`}`
`733`	`733`	`],`
`@@ -796,7 +796,7 @@`
`796`	`796`	`"family": "ML-KEM",`
`797`	`797`	`"standard": [`
`798`	`798`	`{`
`799`		`- "name": "FIPS 203",`
	`799`	`+ "name": "FIPS203",`
`800`	`800`	`"url": "https://doi.org/10.6028/NIST.FIPS.203"`
`801`	`801`	`}`
`802`	`802`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "http://json-schema.org/draft-07/schema#",`
`3`	`3`	`"$id": "http://cyclonedx.org/schema/cryptography-defs.schema.json",`
`4`		`- "$comment": "2026-02-19T23:43:11Z",`
	`4`	`+ "$comment": "2026-02-26T14:12:39Z",`
`5`	`5`	`"title": "Cryptographic Algorithm Family Definitions",`
`6`	`6`	`"description": "Enumerates cryptographic algorithm families and their specific metadata.",`
`7`	`7`	`"type": "object",`