From c92b54363dc24a927678f3b6ce46e7683e013298 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 09:59:20 -0400 Subject: [PATCH 1/8] update Jimfs Signed-off-by: Stephen Crawford --- CHANGELOG.md | 8 ++++---- distribution/tools/plugin-cli/build.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7998d4022cb8..cead0d020feae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,10 +37,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - OpenJDK Update (April 2023 Patch releases) ([#7344](https://github.com/opensearch-project/OpenSearch/pull/7344) - Bump `com.google.http-client:google-http-client:1.43.2` from 1.42.0 to 1.43.2 ([7928](https://github.com/opensearch-project/OpenSearch/pull/7928))) - Add Opentelemetry dependencies ([#7543](https://github.com/opensearch-project/OpenSearch/issues/7543)) -- Bump `org.bouncycastle:bcprov-jdk15on` to `org.bouncycastle:bcprov-jdk15to18` version 1.75 ([8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) -- Bump `org.bouncycastle:bcmail-jdk15on` to `org.bouncycastle:bcmail-jdk15to18` version 1.75 ([8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) -- Bump `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - +- Bump `org.bouncycastle:bcprov-jdk15on` to `org.bouncycastle:bcprov-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) +- Bump `org.bouncycastle:bcmail-jdk15on` to `org.bouncycastle:bcmail-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) +- Bump `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) +- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 ### Changed diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index d39697e81914b..478da9285d140 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -40,7 +40,7 @@ dependencies { api "org.bouncycastle:bcpg-fips:1.0.7.1" api "org.bouncycastle:bc-fips:1.0.2.3" testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.2' + testImplementation 'com.google.jimfs:jimfs:1.3' testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { transitive = false } From 7b9c6b5737b315d4e6fecb8144ce05480511f547 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 10:00:42 -0400 Subject: [PATCH 2/8] Add PR number Signed-off-by: Stephen Crawford --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cead0d020feae..109c8fb41727e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.bouncycastle:bcprov-jdk15on` to `org.bouncycastle:bcprov-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - Bump `org.bouncycastle:bcmail-jdk15on` to `org.bouncycastle:bcmail-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) - Bump `org.bouncycastle:bcpkix-jdk15on` to `org.bouncycastle:bcpkix-jdk15to18` version 1.75 ([#8247](https://github.com/opensearch-project/OpenSearch/pull/8247)) -- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 +- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 ([#8585](https://github.com/opensearch-project/OpenSearch/pull/8585)) ### Changed From fa5c14e0ea644b3f3fea56817468575162e120aa Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 10:02:18 -0400 Subject: [PATCH 3/8] bump in keystore too Signed-off-by: Stephen Crawford --- distribution/tools/keystore-cli/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/tools/keystore-cli/build.gradle b/distribution/tools/keystore-cli/build.gradle index fe57b342ae298..2dce7bbd36dc8 100644 --- a/distribution/tools/keystore-cli/build.gradle +++ b/distribution/tools/keystore-cli/build.gradle @@ -34,7 +34,7 @@ dependencies { compileOnly project(":server") compileOnly project(":libs:opensearch-cli") testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.2' + testImplementation 'com.google.jimfs:jimfs:1.3' testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { transitive = false } From 32080f2636f1256b3d02964bfaaebe9a5feabe19 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 10:02:53 -0400 Subject: [PATCH 4/8] bump in upgrade-cli Signed-off-by: Stephen Crawford --- distribution/tools/upgrade-cli/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/tools/upgrade-cli/build.gradle b/distribution/tools/upgrade-cli/build.gradle index d81d00440a864..1fdd3ceaec9cc 100644 --- a/distribution/tools/upgrade-cli/build.gradle +++ b/distribution/tools/upgrade-cli/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.2' + testImplementation 'com.google.jimfs:jimfs:1.3' testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { transitive = false } From f8acaf53070d6458418a96ed893744de44f90c04 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 10:03:27 -0400 Subject: [PATCH 5/8] Bump in evil tests Signed-off-by: Stephen Crawford --- qa/evil-tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index 3d97aab077251..c9d447ddc989d 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' } // TODO: give each evil test its own fresh JVM for more isolation. From 5a42e351967c780e627aa411dbc165eb811e7c63 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 12:35:27 -0400 Subject: [PATCH 6/8] Specify extended path Signed-off-by: Stephen Crawford --- distribution/tools/keystore-cli/build.gradle | 2 +- distribution/tools/plugin-cli/build.gradle | 2 +- distribution/tools/upgrade-cli/build.gradle | 2 +- qa/evil-tests/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/tools/keystore-cli/build.gradle b/distribution/tools/keystore-cli/build.gradle index 2dce7bbd36dc8..cbbbc03d53c24 100644 --- a/distribution/tools/keystore-cli/build.gradle +++ b/distribution/tools/keystore-cli/build.gradle @@ -34,7 +34,7 @@ dependencies { compileOnly project(":server") compileOnly project(":libs:opensearch-cli") testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.3' + testImplementation 'com.google.jimfs:jimfs:1.3.0' testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { transitive = false } diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 478da9285d140..d0787b7a348cd 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -40,7 +40,7 @@ dependencies { api "org.bouncycastle:bcpg-fips:1.0.7.1" api "org.bouncycastle:bc-fips:1.0.2.3" testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.3' + testImplementation 'com.google.jimfs:jimfs:1.3.0' testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { transitive = false } diff --git a/distribution/tools/upgrade-cli/build.gradle b/distribution/tools/upgrade-cli/build.gradle index 1fdd3ceaec9cc..1067030ac9b2a 100644 --- a/distribution/tools/upgrade-cli/build.gradle +++ b/distribution/tools/upgrade-cli/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" testImplementation project(":test:framework") - testImplementation 'com.google.jimfs:jimfs:1.3' + testImplementation 'com.google.jimfs:jimfs:1.3.0' testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { transitive = false } diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index c9d447ddc989d..bc694d66ab442 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.3' + testImplementation 'com.google.jimfs:jimfs:1.3.0' } // TODO: give each evil test its own fresh JVM for more isolation. From 463d6a840b10e7e6b1f176878e2ad36c398491d8 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Mon, 10 Jul 2023 13:00:46 -0400 Subject: [PATCH 7/8] Fix third party audit Signed-off-by: Stephen Crawford --- qa/evil-tests/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index bc694d66ab442..91cb4c7151a69 100644 --- a/qa/evil-tests/build.gradle +++ b/qa/evil-tests/build.gradle @@ -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', From 6bde4933a60851c63c2bd8de1179632dbcb342dc Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Tue, 11 Jul 2023 11:11:12 -0400 Subject: [PATCH 8/8] trivial change to trigger retry Signed-off-by: Stephen Crawford --- .../src/main/java/org/opensearch/identity/IdentityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/opensearch/identity/IdentityService.java b/server/src/main/java/org/opensearch/identity/IdentityService.java index 1ce107f743efc..54a11c8b31fb3 100644 --- a/server/src/main/java/org/opensearch/identity/IdentityService.java +++ b/server/src/main/java/org/opensearch/identity/IdentityService.java @@ -16,7 +16,7 @@ import org.opensearch.plugins.IdentityPlugin; /** - * Identity and access control for OpenSearch. + * Identity and access control for OpenSearch * * @opensearch.experimental * */