From a0b480ed588fce3bc9d1139d6b04e632b9f8ac26 Mon Sep 17 00:00:00 2001 From: ruzell22 Date: Thu, 9 Jan 2025 21:14:08 +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: Signed-off-by: ruzell22 --- package.json | 2 +- .../cactus-plugin-keychain-azure-kv/package.json | 5 ----- .../package.json | 5 ----- .../package.json | 4 ---- .../cactus-plugin-keychain-memory/package.json | 4 ---- .../cactus-plugin-keychain-vault/package.json | 5 ----- yarn.lock | 16 ++++------------ 7 files changed, 5 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index e34bf65aa6..1f908b7dbf 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "resolutions": { "@babel/traverse": ">=7.23.2", "ansi-html": ">=0.0.8", - "axios": "1.7.7", + "axios": "1.7.9", "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 8a52c51a1c..a64eb9d062 100644 --- a/packages/cactus-plugin-keychain-azure-kv/package.json +++ b/packages/cactus-plugin-keychain-azure-kv/package.json @@ -66,13 +66,8 @@ "@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 37d559ae2e..e5d1db69ca 100644 --- a/packages/cactus-plugin-keychain-google-sm/package.json +++ b/packages/cactus-plugin-keychain-google-sm/package.json @@ -60,13 +60,8 @@ "@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 6649ad594b..e919113b27 100644 --- a/packages/cactus-plugin-keychain-memory-wasm/package.json +++ b/packages/cactus-plugin-keychain-memory-wasm/package.json @@ -64,11 +64,7 @@ "@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 d62918480f..e82e350900 100644 --- a/packages/cactus-plugin-keychain-memory/package.json +++ b/packages/cactus-plugin-keychain-memory/package.json @@ -64,11 +64,7 @@ "@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 fd32b23d6a..aacf018164 100644 --- a/packages/cactus-plugin-keychain-vault/package.json +++ b/packages/cactus-plugin-keychain-vault/package.json @@ -59,13 +59,8 @@ "@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" diff --git a/yarn.lock b/yarn.lock index e0618c76bc..5a0083602d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10279,11 +10279,7 @@ __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" @@ -10376,11 +10372,7 @@ __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" @@ -20912,14 +20904,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.7.7": - version: 1.7.7 - resolution: "axios@npm:1.7.7" +"axios@npm:1.7.9": + version: 1.7.9 + resolution: "axios@npm:1.7.9" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 + checksum: 10/b7a5f660ea53ba9c2a745bf5ad77ad8bf4f1338e13ccc3f9f09f810267d6c638c03dac88b55dae8dc98b79c57d2d6835be651d58d2af97c174f43d289a9fd007 languageName: node linkType: hard