From 7c29cb57e7193c741889942ef875e716648ac525 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 09:58:50 -0700 Subject: [PATCH] [CVE-2020-15366][1.x] Bump ajv from 4.11.8 to 6.12.6 (#3769) (#4035) Add a resolution to bump ajv from 4.11.8 to 6.12.6. Issue Resolve https://github.com/opensearch-project/OpenSearch-Dashboards/issues/1154 Signed-off-by: Anan Zhuang Signed-off-by: Josh Romero Co-authored-by: Josh Romero (cherry picked from commit 77866416196f48a7f22ffc89abe6bdb2eb90e115) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] --- package.json | 1 + yarn.lock | 20 +------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 60df76c0efda..c4b70eb3c9f6 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "resolutions": { "**/@types/node": ">=10.17.17 <10.20.0", "**/@types/react": "^16.14.23", + "**/ajv": "^6.12.6", "**/ansi-html": "^0.0.8", "**/ansi-regex": "^5.0.1", "!chromedriver/**/axios": "^0.21.4", diff --git a/yarn.lock b/yarn.lock index 440cb565a47d..a59a95a6b000 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4067,25 +4067,7 @@ ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^4.7.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY= - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5, ajv@^6.9.1: - version "6.12.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" - integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^6.12.5, ajv@~6.12.6: +ajv@^4.7.0, ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.5, ajv@^6.12.6, ajv@^6.5.5, ajv@^6.9.1, ajv@~6.12.6: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==