Skip to content

Commit e91bfdd

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 8f1b026 commit e91bfdd

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
@@ -42,6 +42,10 @@ plugins {
4242
id 'jacoco'
4343
}
4444

45+
// import versions defined in https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/OpenSearchJavaPlugin.java#L94
46+
// versions https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties
47+
apply plugin: 'opensearch.java'
48+
4549
// Repository on root level is for dependencies that project code depends on. And this block must be placed after plugins{}
4650
repositories {
4751
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:${jackson_version}"
57-
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
58-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
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: "${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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ configurations.all {
8282
// conflict with spring-jcl
8383
exclude group: "commons-logging", module: "commons-logging"
8484
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
85-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
85+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
8686
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
8787
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
8888
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
89-
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
90-
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
89+
resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
90+
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
9191
}
9292
compileJava {
9393
options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])

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)