From 86005123db367239ce08242a82ea8778da798e21 Mon Sep 17 00:00:00 2001 From: ruzell22 Date: Tue, 7 Jan 2025 15:02:17 +0800 Subject: [PATCH] ci(custom-checks): fix dependencies being inconsistent phase 5 Primary Changes --------------- 1. Fixed dependencies on targeted packages: packages/cactus-plugin-keychain-azure-kv packages/cactus-plugin-keychain-google-sm packages/cactus-plugin-keychain-memory packages/cactus-plugin-keychain-memory-wasm packages/cactus-plugin-keychain-vault Fixes: #3688 Signed-off-by: ruzell22 --- package.json | 2 +- .../package.json | 5 ++++ .../package.json | 5 ++++ .../package.json | 4 +++ .../package.json | 4 +++ .../cactus-plugin-keychain-vault/package.json | 7 ++++- yarn.lock | 30 +++++++++---------- 7 files changed, 39 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 7fbc513feb..e34bf65aa6 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "resolutions": { "@babel/traverse": ">=7.23.2", "ansi-html": ">=0.0.8", - "axios": ">=0.27.2", + "axios": "1.7.7", "body-parser": ">=1.20.3", "braces": ">=3.0.3", "x-dicer": ">0.3.1", diff --git a/packages/cactus-plugin-keychain-azure-kv/package.json b/packages/cactus-plugin-keychain-azure-kv/package.json index d6231b1ae3..8a52c51a1c 100644 --- a/packages/cactus-plugin-keychain-azure-kv/package.json +++ b/packages/cactus-plugin-keychain-azure-kv/package.json @@ -66,8 +66,13 @@ "@hyperledger/cactus-common": "2.1.0", "@hyperledger/cactus-core": "2.1.0", "@hyperledger/cactus-core-api": "2.1.0", +<<<<<<< HEAD "axios": "1.7.9", "http-status-codes": "2.1.4", +======= + "axios": "1.7.7", + "http-status-codes": "2.3.0", +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 "typescript-optional": "2.0.1" }, "devDependencies": { diff --git a/packages/cactus-plugin-keychain-google-sm/package.json b/packages/cactus-plugin-keychain-google-sm/package.json index 1c2c73d8db..37d559ae2e 100644 --- a/packages/cactus-plugin-keychain-google-sm/package.json +++ b/packages/cactus-plugin-keychain-google-sm/package.json @@ -60,8 +60,13 @@ "@hyperledger/cactus-common": "2.1.0", "@hyperledger/cactus-core": "2.1.0", "@hyperledger/cactus-core-api": "2.1.0", +<<<<<<< HEAD "axios": "1.7.9", "http-status-codes": "2.1.4", +======= + "axios": "1.7.7", + "http-status-codes": "2.3.0", +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 "typescript-optional": "2.0.1", "uuid": "10.0.0" }, diff --git a/packages/cactus-plugin-keychain-memory-wasm/package.json b/packages/cactus-plugin-keychain-memory-wasm/package.json index e919113b27..6649ad594b 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/package.json +++ b/packages/cactus-plugin-keychain-memory-wasm/package.json @@ -64,7 +64,11 @@ "@hyperledger/cactus-common": "2.1.0", "@hyperledger/cactus-core": "2.1.0", "@hyperledger/cactus-core-api": "2.1.0", +<<<<<<< HEAD "axios": "1.7.9", +======= + "axios": "1.7.7", +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 "express": "4.21.2", "prom-client": "15.1.3", "uuid": "10.0.0" diff --git a/packages/cactus-plugin-keychain-memory/package.json b/packages/cactus-plugin-keychain-memory/package.json index e82e350900..d62918480f 100644 --- a/packages/cactus-plugin-keychain-memory/package.json +++ b/packages/cactus-plugin-keychain-memory/package.json @@ -64,7 +64,11 @@ "@hyperledger/cactus-common": "2.1.0", "@hyperledger/cactus-core": "2.1.0", "@hyperledger/cactus-core-api": "2.1.0", +<<<<<<< HEAD "axios": "1.7.9", +======= + "axios": "1.7.7", +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 "express": "4.21.2", "prom-client": "15.1.3", "rxjs": "7.8.1", diff --git a/packages/cactus-plugin-keychain-vault/package.json b/packages/cactus-plugin-keychain-vault/package.json index be2b50ded4..fd32b23d6a 100644 --- a/packages/cactus-plugin-keychain-vault/package.json +++ b/packages/cactus-plugin-keychain-vault/package.json @@ -59,15 +59,20 @@ "@hyperledger/cactus-common": "2.1.0", "@hyperledger/cactus-core": "2.1.0", "@hyperledger/cactus-core-api": "2.1.0", +<<<<<<< HEAD "axios": "1.7.9", "http-status-codes": "2.1.4", +======= + "axios": "1.7.7", + "http-status-codes": "2.3.0", +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 "node-vault": "0.9.22", "prom-client": "15.1.3", "typescript-optional": "2.0.1" }, "devDependencies": { "@hyperledger/cactus-test-tooling": "2.1.0", - "@types/body-parser": "1.19.3", + "@types/body-parser": "1.19.4", "@types/express": "5.0.0", "@types/internal-ip": "4.1.0", "@types/request": "2.48.7", diff --git a/yarn.lock b/yarn.lock index 13c2c0684d..e0618c76bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10279,7 +10279,11 @@ __metadata: axios: "npm:1.7.9" body-parser: "npm:1.20.3" express: "npm:4.21.2" +<<<<<<< HEAD http-status-codes: "npm:2.1.4" +======= + http-status-codes: "npm:2.3.0" +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 internal-ip: "npm:6.2.0" openapi-types: "npm:12.1.3" typescript-optional: "npm:2.0.1" @@ -10304,7 +10308,7 @@ __metadata: body-parser: "npm:1.20.3" express: "npm:4.21.2" google-gax: "npm:4.0.5" - http-status-codes: "npm:2.1.4" + http-status-codes: "npm:2.3.0" internal-ip: "npm:6.2.0" openapi-types: "npm:12.1.3" typescript-optional: "npm:2.0.1" @@ -10363,7 +10367,7 @@ __metadata: "@hyperledger/cactus-core": "npm:2.1.0" "@hyperledger/cactus-core-api": "npm:2.1.0" "@hyperledger/cactus-test-tooling": "npm:2.1.0" - "@types/body-parser": "npm:1.19.3" + "@types/body-parser": "npm:1.19.4" "@types/express": "npm:5.0.0" "@types/internal-ip": "npm:4.1.0" "@types/request": "npm:2.48.7" @@ -10372,7 +10376,11 @@ __metadata: axios: "npm:1.7.9" body-parser: "npm:1.20.3" express: "npm:4.21.2" +<<<<<<< HEAD http-status-codes: "npm:2.1.4" +======= + http-status-codes: "npm:2.3.0" +>>>>>>> fcd22f313... ci(custom-checks): fix dependencies being inconsistent phase 5 internal-ip: "npm:6.2.0" node-vault: "npm:0.9.22" openapi-types: "npm:12.1.3" @@ -16667,16 +16675,6 @@ __metadata: languageName: node linkType: hard -"@types/body-parser@npm:1.19.3": - version: 1.19.3 - resolution: "@types/body-parser@npm:1.19.3" - dependencies: - "@types/connect": "npm:*" - "@types/node": "npm:*" - checksum: 10/932fa71437c275023799123680ef26ffd90efd37f51a1abe405e6ae6e5b4ad9511b7a3a8f5a12877ed1444a02b6286c0a137a98e914b3c61932390c83643cc2c - languageName: node - linkType: hard - "@types/body-parser@npm:1.19.4": version: 1.19.4 resolution: "@types/body-parser@npm:1.19.4" @@ -20914,14 +20912,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:>=0.27.2": - version: 1.7.2 - resolution: "axios@npm:1.7.2" +"axios@npm:1.7.7": + version: 1.7.7 + resolution: "axios@npm:1.7.7" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10/6ae80dda9736bb4762ce717f1a26ff997d94672d3a5799ad9941c24d4fb019c1dff45be8272f08d1975d7950bac281f3ba24aff5ecd49ef5a04d872ec428782f + checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 languageName: node linkType: hard