From def5794f8b2b6a235f450cd7d90c7ffec548e9ae Mon Sep 17 00:00:00 2001 From: Zvi Grinberg Date: Mon, 6 May 2024 14:12:53 +0300 Subject: [PATCH] fix: get newer cyclonedx version without vuln ci: fix workflow print typo Signed-off-by: Zvi Grinberg --- .github/workflows/stage.yml | 4 ++-- package-lock.json | 25 +++++++++++++++---------- package.json | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index de1f729..2aa08d5 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -103,9 +103,9 @@ jobs: run: | if [[ $RETEST_IS_NECESSARY == "true" ]]; then echo "Re-test was triggered!!, triggering changed file - $TRIGGERING_FILE" - echo "Running Again Unit-test =>" + echo "Running Again Unit-tests =>" npm run test - echo "Running Again Unit-test =>" + echo "Running Again Integration tests =>" npm run integration-tests else echo "Re-test of library is not needed, continuing to deployment!" diff --git a/package-lock.json b/package-lock.json index f5e4d53..b728475 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.23.2", - "@cyclonedx/cyclonedx-library": "~1.3.4", + "@cyclonedx/cyclonedx-library": "~1.13.3", "fast-toml": "^0.5.4", "fast-xml-parser": "^4.2.4", "help": "^3.0.2", @@ -537,11 +537,21 @@ "license": "MIT" }, "node_modules/@cyclonedx/cyclonedx-library": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.3.4.tgz", - "integrity": "sha512-xY0KAQM16ILqg7USghTtagB+ZhuM+kK79VaDS4zsHY73UD0Jfk8hDWRG+RSzdmpMlLfGfB6ys+rjM6n6cYea4g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/@cyclonedx/cyclonedx-library/-/cyclonedx-library-1.13.3.tgz", + "integrity": "sha512-L3i4OWc5pUbmds7dy4jdrHmVQ2qwiqdNrh62g1OpDtBxOUMbMhlGtNTK8htJOvrAeyj7oBxghpOCjHgAMpdtYQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jkowalleck" + }, + { + "type": "individual", + "url": "https://owasp.org/donate/?reponame=www-project-cyclonedx&title=OWASP+CycloneDX" + } + ], "dependencies": { - "packageurl-js": ">=0.0.6 <0.0.8" + "packageurl-js": ">=0.0.6 <0.0.8 || ^1" }, "engines": { "node": ">=14.0.0" @@ -550,11 +560,6 @@ "xmlbuilder2": "^3.0.2" } }, - "node_modules/@cyclonedx/cyclonedx-library/node_modules/packageurl-js": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/packageurl-js/-/packageurl-js-0.0.7.tgz", - "integrity": "sha512-ucJzaXINlIgpqYEY6aNf0J2QGHEeMNwt9fiuhbsZsq3kZ5NRxNlnaEUe6ehB5fWjYRSp75j0/lJWpfTKmBc2oA==" - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "dev": true, diff --git a/package.json b/package.json index d28d77e..71b9cc3 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@babel/core": "^7.23.2", - "@cyclonedx/cyclonedx-library": "~1.3.4", + "@cyclonedx/cyclonedx-library": "~1.13.3", "fast-toml": "^0.5.4", "fast-xml-parser": "^4.2.4", "help": "^3.0.2",