From ed8f72506dd94011f987fbbe2c1e5e16cb31a7d7 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:21:36 -0800 Subject: [PATCH] Revert "Removing explicit jackson dependencies (#1374)" (#1379) (#1381) This reverts commit 04c5f061ca8c1112faa60d516a57775b08ed8fa1. Signed-off-by: Ryan Bogan Signed-off-by: Ryan Bogan (cherry picked from commit 295af547e0ac7e8177feb813ce7f3be29c426850) Co-authored-by: Ryan Bogan <10944539+ryanbogan@users.noreply.github.com> --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2953f68ce..d96ea5cee 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ buildscript { common_utils_version = System.getProperty("common_utils.version", opensearch_build) kotlin_version = System.getProperty("kotlin.version", "1.6.0") job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build) + jackson_version = "2.14.1" } repositories { @@ -139,6 +140,7 @@ configurations.all { resolutionStrategy { force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}" + force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}" force "org.mockito:mockito-core:4.6.1" force "org.yaml:snakeyaml:1.32" } @@ -183,8 +185,11 @@ dependencies { implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' implementation 'org.json:json:20220924' implementation group: 'com.github.wnameless.json', name: 'json-flattener', version: '0.15.1' - // jackson is coming from core now, https://github.com/opensearch-project/opensearch-plugins/issues/191 + // json-base, jackson-databind, jackson-annotations are only used by json-flattener. + // see https://github.com/opensearch-project/OpenSearch/issues/5395. 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}" compileOnly "${group}:opensearch-job-scheduler-spi:${job_scheduler_version}" testImplementation( 'org.assertj:assertj-core:3.16.1',