Skip to content

Commit dd8deff

Browse files
authored
Using jackson and jackson_databind version defined in OpenSearch (#1169) (#1178) (#1185)
Signed-off-by: Peng Huo <[email protected]> (cherry picked from commit 5073215)
1 parent 62a6c1f commit dd8deff

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ buildscript {
88
ext {
99
opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
1010
spring_version = "5.3.22"
11-
jackson_version = "2.13.2"
12-
jackson_databind_version = "2.13.2.2"
1311
}
1412

1513
repositories {
@@ -31,6 +29,10 @@ plugins {
3129
id 'jacoco'
3230
}
3331

32+
// import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
33+
// versions https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
34+
apply plugin: 'opensearch.java'
35+
3436
// Repository on root level is for dependencies that project code depends on. And this block must be placed after plugins{}
3537
repositories {
3638
mavenLocal()
@@ -128,7 +130,7 @@ subprojects {
128130
}
129131

130132
configurations.all {
131-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
133+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
132134
}
133135
}
134136
checkstyle {

opensearch/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ dependencies {
3232
compile project(':core')
3333
compile group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
3434
compile "io.github.resilience4j:resilience4j-retry:1.5.0"
35-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
36-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
37-
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
35+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
36+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
37+
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
3838
compile group: 'org.json', name: 'json', version:'20180813'
3939
compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
4040
compile group: 'org.opensearch', name:'opensearch-ml-client', version: '1.3.4.0-SNAPSHOT'

protocol/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ plugins {
3030

3131
dependencies {
3232
compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
33-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
34-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
35-
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
33+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
34+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
35+
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
3636
implementation 'com.google.code.gson:gson:2.8.9'
3737
compile project(':core')
3838
compile project(':opensearch')

0 commit comments

Comments
 (0)