Skip to content

Commit

Permalink
chore(docker): Update Pnpm to the latest version
Browse files Browse the repository at this point in the history
See also [1].

Note: This brings in two new packages into the expected result for the
test project using workspaces, for an unknown reason. Looking at the
project setup, it is correct to include these two projects into the
result, because they are included into the workspace, see [2]. However,
it seems that it would be better to represent these projects as
`Project`s in the result, not as `Package`s. That could be done in a
future improvement, which probably should also consider changing the
test to analyze the whole directory instead of just a single definition
file, to get a more end-to-end picture, for a better overview.

[1]: https://github.com/pnpm/pnpm/releases/tag/v9.2.0
[2]: https://github.com/oss-review-toolkit/ort/blob/503edeedc8de2bee866e2d308ac5473b69f1d42e/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/package.json#L10-L11

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
  • Loading branch information
fviernau committed Jun 12, 2024
1 parent 2e1399c commit afdd4fa
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
2 changes: 1 addition & 1 deletion docker/versions.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG NPM_VERSION=10.7.0
ARG NUGET_INSPECTOR_VERSION=0.9.12
ARG PHP_VERSION=8.1
ARG PIPTOOL_VERSION=24.0
ARG PNPM_VERSION=8.10.3
ARG PNPM_VERSION=9.2.0
ARG PYENV_GIT_TAG=v2.4.1
ARG PYTHON_INSPECTOR_VERSION=0.10.0
ARG PYTHON_PIPENV_VERSION=2023.12.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,36 @@ analyzer:
url: "https://github.com/dcodeIO/long.js.git"
revision: "088e44e5e3343ef967698565678384fa474b003b"
path: ""
- id: "NPM::pnpm-app-example:1.1.4"
purl: "pkg:npm/pnpm-app-example@1.1.4"
authors:
- "DavidWells"
declared_licenses:
- "ISC"
declared_licenses_processed:
spdx_expression: "ISC"
description: ""
homepage_url: ""
binary_artifact:
url: ""
hash:
value: ""
algorithm: ""
source_artifact:
url: ""
hash:
value: ""
algorithm: ""
vcs:
type: "Git"
url: "<REPLACE_URL>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/src/app"
vcs_processed:
type: "Git"
url: "<REPLACE_URL_PROCESSED>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/src/app"
- id: "NPM::pnpm-workspaces:1.0.1"
purl: "pkg:npm/pnpm-workspaces@1.0.1"
authors:
Expand Down Expand Up @@ -785,6 +815,36 @@ analyzer:
url: "<REPLACE_URL_PROCESSED>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/src/packages/package-a"
- id: "NPM::testing-pnpm-package-b:1.0.2"
purl: "pkg:npm/testing-pnpm-package-b@1.0.2"
authors:
- "Marcel Bochtler"
declared_licenses:
- "ISC"
declared_licenses_processed:
spdx_expression: "ISC"
description: ""
homepage_url: ""
binary_artifact:
url: ""
hash:
value: ""
algorithm: ""
source_artifact:
url: ""
hash:
value: ""
algorithm: ""
vcs:
type: "Git"
url: "<REPLACE_URL>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/src/packages/package-b"
vcs_processed:
type: "Git"
url: "<REPLACE_URL_PROCESSED>"
revision: "<REPLACE_REVISION>"
path: "plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/src/packages/package-b"
scanner: null
advisor: null
evaluator: null
Expand Down

2 comments on commit afdd4fa

@clemens
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: This change causes a warning: 14:13:09.078 [DefaultDispatcher-worker-5] WARN org.ossreviewtoolkit.utils.common.CommandLineTool - The command is required in version >=5.0.0 and <9.0.0, but you are using version 9.2.0. This could lead to problems.

@fviernau
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @clemens . I've addressed this with: #8791.

Please sign in to comment.