@@ -2,6 +2,7 @@ import java.nio.file.Files
2
2
import org.opensearch.gradle.testclusters.OpenSearchCluster
3
3
import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
4
4
import org.opensearch.gradle.test.RestIntegTestTask
5
+ import org.opensearch.gradle.VersionProperties
5
6
import java.util.concurrent.Callable
6
7
import java.nio.file.Paths
7
8
@@ -35,9 +36,7 @@ buildscript {
35
36
36
37
isSameMajorVersion = opensearch_version. split(" \\ ." )[0 ] == bwcVersionShort. split(" \\ ." )[0 ]
37
38
swaggerVersion = " 2.1.24"
38
- jacksonVersion = " 2.18.1"
39
39
swaggerCoreVersion = " 2.2.28"
40
-
41
40
}
42
41
43
42
repositories {
@@ -189,16 +188,10 @@ dependencies {
189
188
implementation " io.swagger.parser.v3:swagger-parser-core:${ swaggerVersion} "
190
189
implementation " io.swagger.parser.v3:swagger-parser:${ swaggerVersion} "
191
190
implementation " io.swagger.parser.v3:swagger-parser-v3:${ swaggerVersion} "
192
- // Declare and force Jackson dependencies for tests
193
- testImplementation(" com.fasterxml.jackson.core:jackson-databind" ) {
194
- version { strictly(" ${ jacksonVersion} " ) }
195
- }
196
- testImplementation(" com.fasterxml.jackson.datatype:jackson-datatype-jsr310" ) {
197
- version { strictly(" ${ jacksonVersion} " ) }
198
- }
199
- testImplementation(" com.fasterxml.jackson.core:jackson-annotations" ) {
200
- version { strictly(" ${ jacksonVersion} " ) }
201
- }
191
+ // Declare Jackson dependencies for tests (from OpenSearch version catalog)
192
+ testImplementation " com.fasterxml.jackson.core:jackson-annotations:${ versions.jackson} "
193
+ testImplementation " com.fasterxml.jackson.core:jackson-databind:${ versions.jackson_databind} "
194
+ testImplementation " com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${ versions.jackson_databind} "
202
195
203
196
// ZipArchive dependencies used for integration tests
204
197
zipArchive group : ' org.opensearch.plugin' , name :' opensearch-ml-plugin' , version : " ${ opensearch_build} "
@@ -209,7 +202,6 @@ dependencies {
209
202
configurations. all {
210
203
resolutionStrategy {
211
204
force(" com.google.guava:guava:33.4.0-jre" ) // CVE for 31.1, keep to force transitive dependencies
212
- force(" com.fasterxml.jackson.core:jackson-core:${ jacksonVersion} " ) // Dependency Jar Hell
213
205
force(" org.apache.httpcomponents.core5:httpcore5:5.3.2" ) // Dependency Jar Hell
214
206
}
215
207
}
0 commit comments