Skip to content

Commit

Permalink
[Backport 2.x] Add jackson-databind and jackson-annotations (opensear…
Browse files Browse the repository at this point in the history
…ch-project#652)

* Add jackson-databind and jackson-annotations (opensearch-project#650)

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit cc34ae8)

* Resolve mockito-core conflict

Signed-off-by: Rupal Mahajan <[email protected]>

---------

Signed-off-by: Rupal Mahajan <[email protected]>
Co-authored-by: Rupal Mahajan <[email protected]>
  • Loading branch information
opensearch-trigger-bot[bot] and rupal-bq authored Feb 20, 2023
1 parent 61bbdb3 commit 20d1c86
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -89,7 +90,7 @@ publishing {
developers {
developer {
name = 'OpenSearch'
url = 'https://github.com/opensearch-project/dashboards-reports'
url = 'https://github.com/opensearch-project/reporting'
}
}
}
Expand Down Expand Up @@ -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}"
Expand All @@ -179,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'

Expand Down

0 comments on commit 20d1c86

Please sign in to comment.