From 4f1e6c205f53ad44017072ac54666957ce23f75a Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Mon, 20 Feb 2023 10:37:16 -0800 Subject: [PATCH 1/2] Add jackson-databind and jackson-annotations (#650) Signed-off-by: Rupal Mahajan (cherry picked from commit cc34ae81a730b954062c61d643c3587c63ebbfd0) --- build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 91242606..06506211 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ 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 { @@ -89,7 +90,7 @@ publishing { developers { developer { name = 'OpenSearch' - url = 'https://github.com/opensearch-project/dashboards-reports' + url = 'https://github.com/opensearch-project/reporting' } } } @@ -165,8 +166,10 @@ 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 is transitive dependencies by json-flattener + // json-base, jackson-databind, jackson-annotations are 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 b1b5a9f27c59c8b15e3ead9b45420a7336696b53 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Mon, 20 Feb 2023 11:58:46 -0800 Subject: [PATCH 2/2] Resolve mockito-core conflict Signed-off-by: Rupal Mahajan --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 06506211..185dca26 100644 --- a/build.gradle +++ b/build.gradle @@ -182,7 +182,7 @@ dependencies { testImplementation "org.opensearch.test:framework:${opensearch_version}" testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - testImplementation "org.mockito:mockito-core:4.7.0" + testImplementation "org.mockito:mockito-core:5.1.0" testImplementation "org.mockito:mockito-junit-jupiter:4.7.0" testImplementation 'com.google.code.gson:gson:2.8.9'