File tree Expand file tree Collapse file tree 5 files changed +17
-13
lines changed Expand file tree Collapse file tree 5 files changed +17
-13
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,10 @@ plugins {
42
42
id ' jacoco'
43
43
}
44
44
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
+
45
49
// Repository on root level is for dependencies that project code depends on. And this block must be placed after plugins{}
46
50
repositories {
47
51
mavenLocal()
Original file line number Diff line number Diff line change @@ -53,9 +53,9 @@ configurations.all {
53
53
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
54
54
resolutionStrategy. force ' commons-codec:commons-codec:1.13'
55
55
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 } "
59
59
}
60
60
61
61
dependencies {
Original file line number Diff line number Diff line change @@ -32,9 +32,9 @@ dependencies {
32
32
api project(' :core' )
33
33
api group : ' org.opensearch' , name : ' opensearch' , version : " ${ opensearch_version} "
34
34
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 } "
38
38
implementation group : ' org.json' , name : ' json' , version :' 20180813'
39
39
compileOnly group : ' org.opensearch.client' , name : ' opensearch-rest-high-level-client' , version : " ${ opensearch_version} "
40
40
implementation group : ' org.opensearch' , name :' opensearch-ml-client' , version : " ${ opensearch_build} "
Original file line number Diff line number Diff line change @@ -82,12 +82,12 @@ configurations.all {
82
82
// conflict with spring-jcl
83
83
exclude group : " commons-logging" , module : " commons-logging"
84
84
// 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 } "
86
86
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
87
87
resolutionStrategy. force ' commons-codec:commons-codec:1.13'
88
88
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 } "
91
91
}
92
92
compileJava {
93
93
options. compilerArgs. addAll([" -processor" , ' lombok.launch.AnnotationProcessorHider$AnnotationProcessor' ])
Original file line number Diff line number Diff line change @@ -30,9 +30,9 @@ plugins {
30
30
31
31
dependencies {
32
32
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 } "
36
36
implementation ' com.google.code.gson:gson:2.8.9'
37
37
implementation project(' :core' )
38
38
implementation project(' :opensearch' )
@@ -44,7 +44,7 @@ dependencies {
44
44
}
45
45
46
46
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 } "
48
48
}
49
49
50
50
test {
You can’t perform that action at this time.
0 commit comments