Skip to content

Commit e9bf060

Browse files
authored
Merge branch 'opensearch-project:main' into main
2 parents 2108401 + 57124dd commit e9bf060

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ dependencies {
275275
runtimeOnly('com.jayway.jsonpath:json-path:2.9.0') {
276276
// OpenSearch core is using slf4j 1.7.36. Therefore, we cannot change the version here.
277277
exclude group: 'org.slf4j', module: 'slf4j-api'
278+
exclude group: 'net.minidev', module: 'json-smart'
278279
}
280+
runtimeOnly group: 'net.minidev', name:'json-smart', version: "${versions.json_smart}"
279281
runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
280282
runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
281283
testFixturesImplementation "org.opensearch:common-utils:${version}"

qa/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ dependencies {
4545
testRuntimeOnly('com.jayway.jsonpath:json-path:2.9.0') {
4646
// OpenSearch core is using slf4j 1.7.36. Therefore, we cannot change the version here.
4747
exclude group: 'org.slf4j', module: 'slf4j-api'
48+
exclude group: 'net.minidev', module: 'json-smart'
4849
}
50+
testRuntimeOnly group: 'net.minidev', name:'json-smart', version: "${versions.json_smart}"
4951
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
5052
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
5153
api "junit:junit:${versions.junit}"

0 commit comments

Comments
 (0)