Skip to content

Commit

Permalink
YarnFunTest: Update expected results
Browse files Browse the repository at this point in the history
At some point, probably due to a Yarn version upgrade in ORT's
Dockerfile, the resolution logic seems to have changed, and Yarn started
to consolidate domutils versions 1.5.1 and 1.7.0 in the tree to just
version 1.5.1. As the Yarn version is not an input property to the test
task, this change went unnoticed so far.

Also commit the `yarn.lock` files as rewritten by Yarn 1.22.10.

Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch.io>
  • Loading branch information
sschuberth committed Mar 18, 2022
1 parent 69ab1d2 commit c087e6f
Show file tree
Hide file tree
Showing 3 changed files with 264 additions and 274 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ project:
- id: "NPM::domhandler:2.4.2"
dependencies:
- id: "NPM::domelementtype:1.3.1"
- id: "NPM::domutils:1.7.0"
- id: "NPM::domutils:1.5.1"
dependencies:
- id: "NPM::dom-serializer:0.1.1"
dependencies:
Expand Down Expand Up @@ -468,36 +468,6 @@ packages:
url: "https://github.com/FB55/domutils.git"
revision: "7d4bd16cd36ffce62362ef91616806ea27e30d95"
path: ""
- id: "NPM::domutils:1.7.0"
purl: "pkg:npm/domutils@1.7.0"
authors:
- "Felix Boehm"
declared_licenses:
- "BSD-2-Clause"
declared_licenses_processed:
spdx_expression: "BSD-2-Clause"
description: "utilities for working with htmlparser2's dom"
homepage_url: "https://github.com/FB55/domutils#readme"
binary_artifact:
url: ""
hash:
value: ""
algorithm: ""
source_artifact:
url: "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"
hash:
value: "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
algorithm: "SHA-1"
vcs:
type: "Git"
url: "git://github.com/FB55/domutils.git"
revision: "34f193ca17d11a98d9310b1965efe5f73d32d79f"
path: ""
vcs_processed:
type: "Git"
url: "https://github.com/FB55/domutils.git"
revision: "34f193ca17d11a98d9310b1965efe5f73d32d79f"
path: ""
- id: "NPM::eachr:3.2.0"
purl: "pkg:npm/eachr@3.2.0"
authors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,32 @@


"@here/harp-fetch@^0.11.0":
version "0.11.0"
resolved "https://registry.yarnpkg.com/@here/harp-fetch/-/harp-fetch-0.11.0.tgz#8d0e0bdb523c7c4f306f676aac65aa6bcb95da1c"
integrity sha512-Yp+3VQdDR9r66MRJ4zSSu6XemnkAz9ahz2e+RRWhdoM4OHih8zvmVbSH1H4WDCW0qkZM2W8z8c66jKPCJoHAPw==
"integrity" "sha512-Yp+3VQdDR9r66MRJ4zSSu6XemnkAz9ahz2e+RRWhdoM4OHih8zvmVbSH1H4WDCW0qkZM2W8z8c66jKPCJoHAPw=="
"resolved" "https://registry.npmjs.org/@here/harp-fetch/-/harp-fetch-0.11.0.tgz"
"version" "0.11.0"
dependencies:
node-fetch "^2.2.0"
"node-fetch" "^2.2.0"

"@here/harp-fetch@^0.3.6":
version "0.3.6"
resolved "https://registry.yarnpkg.com/@here/harp-fetch/-/harp-fetch-0.3.6.tgz#703fc8b034f6e0d621cc2c3ded96c6f904723742"
integrity sha512-KtpnHQXymwfwvYWVqXh5ZV16SXLW7n8hQb1wZYDbcm+5OX/LzYWmwEzEKzxluaNxbo2vt/hM/jeqDlSEGMDelA==
"integrity" "sha512-KtpnHQXymwfwvYWVqXh5ZV16SXLW7n8hQb1wZYDbcm+5OX/LzYWmwEzEKzxluaNxbo2vt/hM/jeqDlSEGMDelA=="
"resolved" "https://registry.npmjs.org/@here/harp-fetch/-/harp-fetch-0.3.6.tgz"
"version" "0.3.6"
dependencies:
node-fetch "^2.2.0"
"node-fetch" "^2.2.0"

node-fetch@^2.2.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
"@scope1/pkg1@file:/home/sse1be/Development/GitHub/oss-review-toolkit/ort/analyzer/src/funTest/assets/projects/synthetic/yarn-workspaces/packages/pkg1":
"resolved" "file:packages/pkg1"
"version" "1.0.0"
dependencies:
"@here/harp-fetch" "^0.11.0"

"node-fetch@^2.2.0":
"integrity" "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
"resolved" "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"
"version" "2.6.0"

"pkg2@file:/home/sse1be/Development/GitHub/oss-review-toolkit/ort/analyzer/src/funTest/assets/projects/synthetic/yarn-workspaces/packages/pkg2":
"resolved" "file:packages/pkg2"
"version" "1.0.0"
dependencies:
"@here/harp-fetch" "^0.3.6"
Loading

0 comments on commit c087e6f

Please sign in to comment.