Skip to content

Commit 04c2f17

Browse files
committed
Using jackson and jackson_databind version defined in OpenSearch (opensearch-project#1169) (opensearch-project#1178)
Signed-off-by: Peng Huo <[email protected]> (cherry picked from commit 5073215)
1 parent 963e14e commit 04c2f17

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ plugins {
3939
id 'jacoco'
4040
}
4141

42+
// import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
43+
// versions https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
44+
apply plugin: 'opensearch.java'
45+
4246
// Repository on root level is for dependencies that project code depends on. And this block must be placed after plugins{}
4347
repositories {
4448
mavenLocal()

integ-test/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ configurations.all {
5353
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
5454
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
5555
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
56-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.2'
57-
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2'
58-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
56+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
57+
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
58+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
5959
}
6060

6161
dependencies {

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: '2.13.2'
36-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
37-
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2'
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ configurations.all {
5757
// conflict with spring-jcl
5858
exclude group: "commons-logging", module: "commons-logging"
5959
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
60-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.2'
60+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
6161
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
6262
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
6363
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
64-
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2'
65-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
64+
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
65+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
6666
}
6767

6868
dependencies {

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: '2.13.2'
34-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
35-
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2'
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:2.13.2.2'
47+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
4848
}
4949

5050
test {

0 commit comments

Comments
 (0)