Skip to content

Commit c6756ec

Browse files
penghuopenghuo
authored
Using jackson and jackson_databind version defined in OpenSearch (#1169) (#1179)
Signed-off-by: Peng Huo <penghuo@gmail.com> (cherry picked from commit 5073215)
1 parent 777bc5d commit c6756ec

7 files changed

Lines changed: 27 additions & 24 deletions

File tree

‎build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ buildscript {
88
ext {
99
opensearch_version = System.getProperty("opensearch.version", "2.4.1-SNAPSHOT")
1010
spring_version = "5.3.22"
11-
jackson_version = "2.14.1"
12-
jackson_databind_version = "2.14.1"
1311
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1412
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1513
version_tokens = opensearch_version.tokenize('-')
@@ -69,6 +67,10 @@ plugins {
6967
id 'jacoco'
7068
}
7169

70+
// import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
71+
// versions https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
72+
apply plugin: 'opensearch.java'
73+
7274
// Repository on root level is for dependencies that project code depends on. And this block must be placed after plugins{}
7375
repositories {
7476
mavenLocal()

‎core/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ dependencies {
4545
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
4646
api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
4747
api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
48-
api "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
49-
api "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
50-
api "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
48+
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
49+
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
50+
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
5151
api project(':common')
5252

5353
testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')

‎integ-test/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ configurations.all {
6666
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
6767
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
6868
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
69-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
70-
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
71-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
69+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
70+
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
71+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
72+
7273
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
7374
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
7475
resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"

‎opensearch/build.gradle‎

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

‎plugin/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ configurations.all {
8484
// conflict with spring-jcl
8585
exclude group: "commons-logging", module: "commons-logging"
8686
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
87-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
87+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
8888
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
8989
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
9090
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
91-
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
92-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
91+
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
92+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
9393
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
9494
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
9595
resolutionStrategy.force "com.squareup.okhttp3:okhttp:4.9.3"
@@ -104,9 +104,9 @@ compileTestJava {
104104

105105
dependencies {
106106
api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
107-
api "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
108-
api "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
109-
api "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
107+
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
108+
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
109+
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
110110

111111

112112
api project(":ppl")

‎prometheus/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ repositories {
1717
dependencies {
1818
api project(':core')
1919
implementation "io.github.resilience4j:resilience4j-retry:1.5.0"
20-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
21-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
22-
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
20+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${versions.jackson}"
21+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${versions.jackson_databind}"
22+
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${versions.jackson}"
2323
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.3'
2424
implementation 'com.github.babbel:okhttp-aws-signer:1.0.2'
2525
implementation group: 'org.json', name: 'json', version: '20180813'

‎protocol/build.gradle‎

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

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

4646
configurations.all {
47-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
47+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
4848
}
4949

5050
test {

0 commit comments

Comments
 (0)