Merge branch 'master' into spdx-schema_pull-latest

Author: jkowalleck

.github/workflows/build_docs.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
     - name: Checkout
       # see https://github.com/actions/checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: Set up JDK
       # see https://github.com/actions/setup-java
       uses: actions/setup-java@v5
@@ -33,7 +33,7 @@ jobs:
       run: ./gen.sh
     - name: Archive Schema documentation
       # https://github.com/actions/upload-artifact
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: XML-Schema-documentation
         path: docgen/xml/docs
@@ -46,7 +46,7 @@ jobs:
     steps:
     - name: Checkout
       # see https://github.com/actions/checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: Setup Python Environment
       # see https://github.com/actions/setup-python
       uses: actions/setup-python@v6
@@ -57,7 +57,7 @@ jobs:
       run: ./gen.sh
     - name: Archive Schema documentation
       # https://github.com/actions/upload-artifact
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: JSON-Schema-documentation
         path: docgen/json/docs
@@ -70,12 +70,12 @@ jobs:
     steps:
     - name: Checkout
       # see https://github.com/actions/checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: Generate Schema documentation
       run: ./gen.sh
     - name: Archive Schema documentation
       # https://github.com/actions/upload-artifact
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: PROTO-Schema-documentation
         path: docgen/proto/docs

.github/workflows/bundle_2.0_schemas.yml

@@ -19,12 +19,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
 

.github/workflows/test_java.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
     - name: Checkout
       # see https://github.com/actions/checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: Set up JDK
       # see https://github.com/actions/setup-java
       uses: actions/setup-java@v5

.github/workflows/test_js.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - name: Checkout
         # see https://github.com/actions/checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup Node.js
         # see https://github.com/actions/setup-node
         uses: actions/setup-node@v6

.github/workflows/test_php.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - name: Checkout
         # see https://github.com/actions/checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup PHP
         # see https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2

.github/workflows/test_proto.yml

@@ -26,6 +26,6 @@ jobs:
     steps:
       - name: Checkout
         # see https://github.com/actions/checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run test
         run: ./test.sh

schema/bom-1.7.schema.json

@@ -981,7 +981,7 @@
         "versionRange": {
           "$ref": "#/definitions/versionRange",
           "title": "Component Version Range",
-          "description": "For an external component, this specifies the accepted version range.\nThe value must adhere to the Package URL Version Range syntax (vers), as defined at <https://github.com/package-url/vers-spec\nMay only be used if `.isExternal` is set to `true`.\nMust be used exclusively, either 'version' or 'versionRange', but not both."
+          "description": "For an external component, this specifies the accepted version range.\nThe value must adhere to the Package URL Version Range syntax (vers), as defined at https://github.com/package-url/vers-spec\nMay only be used if `.isExternal` is set to `true`.\nMust be used exclusively, either 'version' or 'versionRange', but not both."
         },
         "isExternal": {
           "type": "boolean",
@@ -1103,7 +1103,7 @@
             "patches": {
               "type": "array",
               "title": "Patches",
-              "description": ">A list of zero or more patches describing how the component deviates from an ancestor, descendant, or variant. Patches may be complementary to commits or may be used in place of commits.",
+              "description": "A list of zero or more patches describing how the component deviates from an ancestor, descendant, or variant. Patches may be complementary to commits or may be used in place of commits.",
               "items": {"$ref": "#/definitions/patch"}
             },
             "notes": {

schema/cryptography-defs.json

@@ -468,6 +468,10 @@
         {
           "pattern": "ChaCha20-Poly1305",
           "primitive": "ae"
+        },
+        {
+          "pattern": "XChaCha20-Poly1305",
+          "primitive": "ae"
         }
       ]
     },
@@ -1018,11 +1022,11 @@
       ],
       "variant": [
         {
-          "pattern": "TUAC[-MAC]",
+          "pattern": "TUAK[-MAC]",
           "primitive": "mac"
         },
         {
-          "pattern": "TUAC[-KDF]",
+          "pattern": "TUAK[-KDF]",
           "primitive": "kdf"
         }
       ]
@@ -1407,7 +1411,7 @@
       ],
       "variant": [
         {
-          "pattern": "bcrypt[-{cost)]",
+          "pattern": "bcrypt[-{cost}]",
           "primitive": "hash"
         }
       ]