Merge remote-tracking branch 'origin/main' into feat/tools-as-components

.github/workflows/nodejs.yml

@@ -175,6 +175,9 @@ jobs:
       matrix:
         include:
           - npm-version: 'latest'
+          - npm-version: '^11'
+            ## "node": "^20.17.0 || >=22.9.0"
+            node-version: '^22.9'
           - npm-version: '^10'
             ## "node": "^18.17.0 || >=20.5.0"
             node-version: '^20.5'

.github/workflows/npm-ls_demo-results.yml

@@ -20,23 +20,24 @@ jobs:
       matrix:
         subject:
           # - deps-from-git
-          # - alternative-package-registry
-          # - bundled-dependencies
-          # - dev-dependencies
-          # - juice-shop
-          # - local-dependencies
+          - alternative-package-registry
+          - bundled-dependencies
+          - dev-dependencies
+          - juice-shop
+          - local-dependencies
           - local-workspaces
-          # - package-integrity
-          # - package-with-build-id
+          - package-integrity
+          - package-with-build-id
         additional_npm-ls_args: [ '' ]
         npm-version:
           ## see https://www.npmjs.com/package/npm?activeTab=versions
           ## see also: https://github.com/npm/cli/releases
-          - '10'     # Current
-          - '9'      # Legacy
-          - '8'      # Legacy
-          - '7'      # Legacy
-          - '6'      # Legacy
+          - '11'     # Current
+          #- '10'     # Legacy
+          #- '9'      # Legacy
+          #- '8'      # Legacy
+          #- '7'      # Legacy
+          #- '6'      # Legacy
         node-version:
           ## action based on https://github.com/actions/node-versions/releases
           ## see also: https://nodejs.org/en/about/releases/
@@ -51,24 +52,33 @@ jobs:
           - macos-latest
         include:
           - subject: local-workspaces
-            additional_npm-ls_args: '--workspace==my-local-e'
-            npm-version: '10'   # Current
-            node-version: '22'  # Current
+            additional_npm-ls_args: '--workspace=my-local-e'
+            npm-version: '11'   # Current
+            node-version: '22'  # LTS
             os: ubuntu-latest
           - subject: local-workspaces
-            additional_npm-ls_args: '--workspace==my-local --workspace==my-local-e'
-            npm-version: '10'   # Current
-            node-version: '22'  # Current
+            additional_npm-ls_args: '--workspace=my-local --workspace=my-local-e'
+            npm-version: '11'   # Current
+            node-version: '22'  # LTS
             os: ubuntu-latest
           - subject: local-workspaces
             additional_npm-ls_args: '--workspaces'
-            npm-version: '10'   # Current
-            node-version: '22'  # Current
+            npm-version: '11'   # Current
+            node-version: '22'  # LTS
             os: ubuntu-latest
         exclude:
           - # macos-latest no longer supports node14
             os: macos-latest
             node-version: '14'
+          - # npm11 requires node ^20.17.0 || >=22.9.0
+            npm-version: '11'
+            node-version: '18'
+          - # npm11 requires node ^20.17.0 || >=22.9.0
+            npm-version: '11'
+            node-version: '16'
+          - # npm11 requires node ^20.17.0 || >=22.9.0
+            npm-version: '11'
+            node-version: '14'
           - # npm10 requires node ^18.17.0 || >=20.5.0
             npm-version: '10'
             node-version: '16'
@@ -126,6 +136,7 @@ jobs:
         working-directory: '${{ env.DEMO_ROOT_DIR}}/${{ matrix.subject }}'
       - name: Artifact RESULTS
         # see https://github.com/actions/upload-artifact
+        if: ${{ ! cancelled() }}
         uses: actions/upload-artifact@v4
         with:
           name: '${{ env.RESULTS_ARTIFACT }}_${{ matrix.subject }}${{ matrix.additional_npm-ls_args }}_npm${{ matrix.npm-version }}_node${{ matrix.node-version }}_${{ matrix.os }}'

HISTORY.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 <!-- unreleased changes go here -->
 
 * Added
+  * Official support for `npm@11` ([#1245] via [#1249])
   * Capability to gather license text evidences ([#256] via [#1243])  
     This feature can be controlled via CLI switch `--gather-license-texts`.  
     This feature is experimental. This feature is disabled per default.
@@ -20,6 +21,8 @@ All notable changes to this project will be documented in this file.
 [#1218]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/1218
 [#1237]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/1237
 [#1243]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/1243
+[#1245]: https://github.com/CycloneDX/cyclonedx-node-npm/issues/1245
+[#1249]: https://github.com/CycloneDX/cyclonedx-node-npm/pull/1249
 
 ## 1.19.3 -- 2024-07-15
 

README.md

@@ -24,7 +24,7 @@ and might have properties following [`cdx:npm` Namespace Taxonomy](https://githu
 ## Requirements
 
 * `node` >= `14`
-* `npm` in range `6 - 10`
+* `npm` in range `6 - 11`
 
 ## Installation
 

package.json

@@ -71,7 +71,7 @@
   "type": "commonjs",
   "engines": {
     "node": ">=14",
-    "npm": "6 - 10"
+    "npm": "6 - 11"
   },
   "directories": {
     "doc": "docs",