From ed2f7b3b4afbf9262fa6dbe05fe086bc2b1afbe6 Mon Sep 17 00:00:00 2001 From: Heemin Kim Date: Wed, 11 Dec 2024 11:19:06 -0800 Subject: [PATCH] Upgrade jsonpath from 2.8.0 to 2.9.0 Signed-off-by: Heemin Kim --- CHANGELOG.md | 1 + build.gradle | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e6016ff9..b937d4f36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,4 +29,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Maintenance * Select index settings based on cluster version[2236](https://github.com/opensearch-project/k-NN/pull/2236) * Added null checks for fieldInfo in ExactSearcher to avoid NPE while running exact search for segments with no vector field (#2278)[https://github.com/opensearch-project/k-NN/pull/2278] +* Upgrade jsonpath from 2.8.0 to 2.9.0[2325](https://github.com/opensearch-project/k-NN/pull/2325) ### Refactoring diff --git a/build.gradle b/build.gradle index 7fd67d1b2..e2c1db13f 100644 --- a/build.gradle +++ b/build.gradle @@ -298,11 +298,16 @@ dependencies { testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.10' testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.3' testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.15.4' - testFixturesImplementation 'com.jayway.jsonpath:json-path:2.8.0' + // json-path 2.9.0 depends on slf4j 2.0.11, which conflicts with the version used by OpenSearch core. + // Excluding slf4j here since json-path is only used for testing, and logging failures in this context are acceptable. + testFixturesImplementation('com.jayway.jsonpath:json-path:2.9.0') { + exclude group: 'org.slf4j', module: 'slf4j-api' + } testFixturesImplementation "org.opensearch:common-utils:${version}" implementation 'com.github.oshi:oshi-core:6.4.13' api "net.java.dev.jna:jna:5.13.0" api "net.java.dev.jna:jna-platform:5.13.0" + // OpenSearch core is using slf4j 1.7.36. Therefore, we cannot change the version here. implementation 'org.slf4j:slf4j-api:1.7.36' zipArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}"