From 6462641cc41e39691003c994f55e3ba156a08161 Mon Sep 17 00:00:00 2001 From: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Date: Tue, 11 Jul 2023 16:35:28 -0400 Subject: [PATCH] Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 (#8585) * update Jimfs Signed-off-by: Stephen Crawford * Add PR number Signed-off-by: Stephen Crawford * bump in keystore too Signed-off-by: Stephen Crawford * bump in upgrade-cli Signed-off-by: Stephen Crawford * Bump in evil tests Signed-off-by: Stephen Crawford * Specify extended path Signed-off-by: Stephen Crawford * Fix third party audit Signed-off-by: Stephen Crawford * trivial change to trigger retry Signed-off-by: Stephen Crawford --------- Signed-off-by: Stephen Crawford Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> (cherry picked from commit 89533c80b7d79eec41f6f478196886ff3bf60193) --- CHANGELOG.md | 1 + distribution/tools/plugin-cli/build.gradle | 8 ++++++-- qa/evil-tests/build.gradle | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af9ad503ad347..ad1b28dbb00a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `org.xerial.snappy:snappy-java` from 1.1.8.2 to 1.1.10.3 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252)) - Bump `com.squareup.okhttp3:okhttp` from 4.9.3 to 4.11.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252)) - Bump `com.squareup.okio:okio` from 2.8.0 to 3.5.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252)) +- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 ([#8585](https://github.com/opensearch-project/OpenSearch/pull/8585)) ### Changed ### Deprecated diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 14e75dc067476..f47f4416b1fb2 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -38,8 +38,12 @@ dependencies { api "org.bouncycastle:bcpg-fips:1.0.5.1" api "org.bouncycastle:bc-fips:1.0.2.3" testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.2' - testRuntimeOnly 'com.google.guava:guava:32.0.1-jre' + testImplementation 'com.google.jimfs:jimfs:1.3.0' + testRuntimeOnly("com.google.guava:guava:${versions.guava}") { + transitive = false + } + + implementation 'org.apache.commons:commons-compress:1.23.0' } tasks.named("dependencyLicenses").configure { diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index 19dc72c0c784f..fab925d887847 100644 --- a/qa/evil-tests/build.gradle +++ b/qa/evil-tests/build.gradle @@ -40,7 +40,7 @@ apply plugin: 'opensearch.testclusters' apply plugin: 'opensearch.standalone-test' dependencies { - testImplementation 'com.google.jimfs:jimfs:1.2' + testImplementation 'com.google.jimfs:jimfs:1.3.0' } // TODO: give each evil test its own fresh JVM for more isolation. @@ -62,7 +62,6 @@ thirdPartyAudit { 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray', 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1', 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2', - 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3', 'com.google.common.hash.Striped64', 'com.google.common.hash.Striped64$1', 'com.google.common.hash.Striped64$Cell',