From bad6d3bf960991e21109221ae79fa7a107a4b503 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Thu, 15 Dec 2022 06:22:06 +0000 Subject: [PATCH 1/3] Remove jackson-databind and jackson-annotations dependencies Signed-off-by: Rupal Mahajan --- reports-scheduler/build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index 068089a8..bf4cf9ba 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -27,7 +27,6 @@ buildscript { common_utils_version = System.getProperty("common_utils.version", opensearch_build) job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build) kotlin_version = System.getProperty("kotlin.version", "1.6.0") - jackson_version = "2.14.1" } repositories { @@ -166,10 +165,8 @@ dependencies { implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' implementation "org.json:json:20180813" implementation group: 'com.github.wnameless.json', name: 'json-flattener', version: '0.15.1' - // json-base, jackson-databind, jackson-annotations are transitive dependencies by json-flattener + // json-base is transitive dependencies by json-flattener implementation group: 'com.github.wnameless.json', name: 'json-base', version: '2.2.1' - implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}" - implementation "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}" implementation 'org.jsoup:jsoup:1.15.3' implementation 'com.google.code.gson:gson:2.8.9' implementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" From 482362f16094e6a7ec3657fe8f806fabab451a7f Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Thu, 15 Dec 2022 07:14:24 +0000 Subject: [PATCH 2/3] resolve dompurify conflicting dependencies Signed-off-by: Rupal Mahajan --- dashboards-reports/package.json | 4 ++-- dashboards-reports/yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json index f515e313..d778abf4 100644 --- a/dashboards-reports/package.json +++ b/dashboards-reports/package.json @@ -19,7 +19,7 @@ "async-mutex": "^0.2.6", "babel-polyfill": "^6.26.0", "cron-validator": "^1.1.1", - "dompurify": "^2.3.8", + "dompurify": "^2.4.1", "elastic-builder": "^2.7.1", "enzyme-adapter-react-16": "^1.15.5", "jest-fetch-mock": "^3.0.3", @@ -41,7 +41,7 @@ }, "devDependencies": { "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards", - "@types/dompurify": "^2.3.3", + "@types/dompurify": "^2.4.0", "@types/enzyme-adapter-react-16": "^1.0.6", "@types/jsdom": "^16.2.3", "@types/puppeteer-core": "^5.4.0", diff --git a/dashboards-reports/yarn.lock b/dashboards-reports/yarn.lock index f035eb12..c028c201 100644 --- a/dashboards-reports/yarn.lock +++ b/dashboards-reports/yarn.lock @@ -786,10 +786,10 @@ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== -"@types/dompurify@^2.3.3": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.3.tgz#c24c92f698f77ed9cc9d9fa7888f90cf2bfaa23f" - integrity sha512-nnVQSgRVuZ/843oAfhA25eRSNzUFcBPk/LOiw5gm8mD9/X7CNcbRkQu/OsjCewO8+VIYfPxUnXvPEVGenw14+w== +"@types/dompurify@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" + integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg== dependencies: "@types/trusted-types" "*" @@ -2508,10 +2508,10 @@ domhandler@^3.0, domhandler@^3.0.0: dependencies: domelementtype "^2.0.1" -dompurify@^2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f" - integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw== +dompurify@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631" + integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA== domutils@^2.0.0: version "2.2.0" From 0fe61f5c7cc67f6579a7774e67a4e0f646523eeb Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Thu, 15 Dec 2022 07:25:14 +0000 Subject: [PATCH 3/3] fix build Signed-off-by: Rupal Mahajan --- dashboards-reports/package.json | 2 +- dashboards-reports/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json index d778abf4..8cd23733 100644 --- a/dashboards-reports/package.json +++ b/dashboards-reports/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards", - "@types/dompurify": "^2.4.0", + "@types/dompurify": "^2.3.3", "@types/enzyme-adapter-react-16": "^1.0.6", "@types/jsdom": "^16.2.3", "@types/puppeteer-core": "^5.4.0", diff --git a/dashboards-reports/yarn.lock b/dashboards-reports/yarn.lock index c028c201..1b2fea00 100644 --- a/dashboards-reports/yarn.lock +++ b/dashboards-reports/yarn.lock @@ -786,10 +786,10 @@ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== -"@types/dompurify@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" - integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg== +"@types/dompurify@^2.3.3": + version "2.3.3" + resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.3.3.tgz#c24c92f698f77ed9cc9d9fa7888f90cf2bfaa23f" + integrity sha512-nnVQSgRVuZ/843oAfhA25eRSNzUFcBPk/LOiw5gm8mD9/X7CNcbRkQu/OsjCewO8+VIYfPxUnXvPEVGenw14+w== dependencies: "@types/trusted-types" "*"