From fabdb3dc2d0874344478d8b5aa8c5f0acd771b65 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 16 Jun 2023 10:33:57 -0400 Subject: [PATCH 1/6] Update all guava Signed-off-by: Stephen Crawford --- buildSrc/version.properties | 2 +- plugins/ingest-attachment/licenses/guava-31.1-jre.jar.sha1 | 1 - plugins/ingest-attachment/licenses/guava-32.0.1-jre.jar.sha1 | 1 + plugins/repository-azure/build.gradle | 2 +- plugins/repository-azure/licenses/guava-31.1-jre.jar.sha1 | 1 - plugins/repository-azure/licenses/guava-32.0.1-jre.jar.sha1 | 1 + plugins/repository-gcs/build.gradle | 2 +- plugins/repository-gcs/licenses/guava-31.1-jre.jar.sha1 | 1 - plugins/repository-gcs/licenses/guava-32.0.1-jre.jar.sha1 | 1 + plugins/repository-hdfs/licenses/guava-31.1-jre.jar.sha1 | 1 - plugins/repository-hdfs/licenses/guava-32.0.1-jre.jar.sha1 | 1 + 11 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 plugins/ingest-attachment/licenses/guava-31.1-jre.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/guava-32.0.1-jre.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/guava-31.1-jre.jar.sha1 create mode 100644 plugins/repository-azure/licenses/guava-32.0.1-jre.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/guava-31.1-jre.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/guava-32.0.1-jre.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/guava-31.1-jre.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/guava-32.0.1-jre.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 7a4c7321df268..33fad06328b80 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -22,7 +22,7 @@ jettison = 1.5.4 woodstox = 6.4.0 kotlin = 1.7.10 antlr4 = 4.11.1 -guava = 31.1-jre +guava = 32.0.1-jre protobuf = 3.22.3 jakarta_annotation = 1.3.5 diff --git a/plugins/ingest-attachment/licenses/guava-31.1-jre.jar.sha1 b/plugins/ingest-attachment/licenses/guava-31.1-jre.jar.sha1 deleted file mode 100644 index e57390ebe1299..0000000000000 --- a/plugins/ingest-attachment/licenses/guava-31.1-jre.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60458f877d055d0c9114d9e1a2efb737b4bc282c \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/guava-32.0.1-jre.jar.sha1 b/plugins/ingest-attachment/licenses/guava-32.0.1-jre.jar.sha1 new file mode 100644 index 0000000000000..80dc9e9308a6c --- /dev/null +++ b/plugins/ingest-attachment/licenses/guava-32.0.1-jre.jar.sha1 @@ -0,0 +1 @@ +6e5d51a72d142f2d40a57dfb897188b36a95b489 \ No newline at end of file diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index d711950f1392d..12bf189312359 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -69,7 +69,7 @@ dependencies { api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}" api 'org.codehaus.woodstox:stax2-api:4.2.1' implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" - runtimeOnly 'com.google.guava:guava:31.1-jre' + runtimeOnly 'com.google.guava:guava:32.0.1-jre' api 'org.apache.commons:commons-lang3:3.12.0' testImplementation project(':test:fixtures:azure-fixture') } diff --git a/plugins/repository-azure/licenses/guava-31.1-jre.jar.sha1 b/plugins/repository-azure/licenses/guava-31.1-jre.jar.sha1 deleted file mode 100644 index e57390ebe1299..0000000000000 --- a/plugins/repository-azure/licenses/guava-31.1-jre.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60458f877d055d0c9114d9e1a2efb737b4bc282c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/guava-32.0.1-jre.jar.sha1 b/plugins/repository-azure/licenses/guava-32.0.1-jre.jar.sha1 new file mode 100644 index 0000000000000..80dc9e9308a6c --- /dev/null +++ b/plugins/repository-azure/licenses/guava-32.0.1-jre.jar.sha1 @@ -0,0 +1 @@ +6e5d51a72d142f2d40a57dfb897188b36a95b489 \ No newline at end of file diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 0b13a2e09afbf..75ba6efe54957 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -54,7 +54,7 @@ versions << [ dependencies { api 'com.google.cloud:google-cloud-storage:1.113.1' api 'com.google.cloud:google-cloud-core:2.5.10' - runtimeOnly 'com.google.guava:guava:31.1-jre' + runtimeOnly 'com.google.guava:guava:32.0.1-jre' api 'com.google.guava:failureaccess:1.0.1' api 'com.google.http-client:google-http-client:1.43.2' api "commons-logging:commons-logging:${versions.commonslogging}" diff --git a/plugins/repository-gcs/licenses/guava-31.1-jre.jar.sha1 b/plugins/repository-gcs/licenses/guava-31.1-jre.jar.sha1 deleted file mode 100644 index e57390ebe1299..0000000000000 --- a/plugins/repository-gcs/licenses/guava-31.1-jre.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60458f877d055d0c9114d9e1a2efb737b4bc282c \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/guava-32.0.1-jre.jar.sha1 b/plugins/repository-gcs/licenses/guava-32.0.1-jre.jar.sha1 new file mode 100644 index 0000000000000..80dc9e9308a6c --- /dev/null +++ b/plugins/repository-gcs/licenses/guava-32.0.1-jre.jar.sha1 @@ -0,0 +1 @@ +6e5d51a72d142f2d40a57dfb897188b36a95b489 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/guava-31.1-jre.jar.sha1 b/plugins/repository-hdfs/licenses/guava-31.1-jre.jar.sha1 deleted file mode 100644 index e57390ebe1299..0000000000000 --- a/plugins/repository-hdfs/licenses/guava-31.1-jre.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -60458f877d055d0c9114d9e1a2efb737b4bc282c \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/guava-32.0.1-jre.jar.sha1 b/plugins/repository-hdfs/licenses/guava-32.0.1-jre.jar.sha1 new file mode 100644 index 0000000000000..80dc9e9308a6c --- /dev/null +++ b/plugins/repository-hdfs/licenses/guava-32.0.1-jre.jar.sha1 @@ -0,0 +1 @@ +6e5d51a72d142f2d40a57dfb897188b36a95b489 \ No newline at end of file From d072850c69b4297696eb4aaffaf8c459cf89a2e5 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 16 Jun 2023 10:37:17 -0400 Subject: [PATCH 2/6] changelog Signed-off-by: Stephen Crawford --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f2b534eb379..d2dc12acdb10a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `io.projectreactor:reactor-core` from 3.5.1 to 3.5.6 in /plugins/repository-azure ([#8016](https://github.com/opensearch-project/OpenSearch/pull/8016)) - Bump `com.google.guava:guava` from 32.0.0-jre to 32.0.1-jre in /distribution/tools/upgrade-cli ([#8011](https://github.com/opensearch-project/OpenSearch/pull/8011)) - Bump `com.google.guava:guava` from 32.0.0-jre to 32.0.1-jre in /distribution/tools/plugin-cli ([#8012](https://github.com/opensearch-project/OpenSearch/pull/8012)) +- Bump all `com.google.guava:guava` to 32.0.1-jre ([#8107](https://github.com/opensearch-project/OpenSearch/pull/8107)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) @@ -66,7 +67,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Change `com.amazonaws.sdk.ec2MetadataServiceEndpointOverride` to `aws.ec2MetadataServiceEndpoint` ([7372](https://github.com/opensearch-project/OpenSearch/pull/7372/)) - Change `com.amazonaws.sdk.stsEndpointOverride` to `aws.stsEndpointOverride` ([7372](https://github.com/opensearch-project/OpenSearch/pull/7372/)) - Align range and default value for deletes_pct_allowed in merge policy ([#7730](https://github.com/opensearch-project/OpenSearch/pull/7730)) -- Rename QueryPhase actors like Suggest, Rescore to be processors rather than phase ([#8025](https://github.com/opensearch-project/OpenSearch/pull/8025)) +- Rename QueryPhase actors like Suggest, Rescore to be processors rather than phase ([#8025](https://github.com/opensearch-project/OpenSearch/pull/8025)) ### Deprecated From ac74b94782c2976e335ce8ebc2760b5fb64ea4ba Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 16 Jun 2023 11:02:50 -0400 Subject: [PATCH 3/6] remove ignors Signed-off-by: Stephen Crawford --- plugins/ingest-attachment/build.gradle | 1 - plugins/repository-azure/build.gradle | 1 - plugins/repository-gcs/build.gradle | 1 - plugins/repository-hdfs/build.gradle | 1 - qa/evil-tests/build.gradle | 3 +-- 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index 5f8d7dbcd9ccd..1f3c80909733c 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/build.gradle @@ -126,7 +126,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', diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 12bf189312359..2372570ba9fd9 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -206,7 +206,6 @@ thirdPartyAudit { 'com.google.common.hash.Striped64$Cell', 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1', 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2', - 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3', 'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper', 'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1', 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray', diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 75ba6efe54957..392d554111d68 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -110,7 +110,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.util.concurrent.AbstractFuture$UnsafeAtomicHelper', 'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1', 'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray', diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 7edc4def0b199..7ac54544f7a1b 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -359,7 +359,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', diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index 19dc72c0c784f..d64462757ba65 100644 --- a/qa/evil-tests/build.gradle +++ b/qa/evil-tests/build.gradle @@ -33,7 +33,7 @@ * integration, change default filesystem impl, mess with arbitrary * threads, etc. */ - + import org.opensearch.gradle.info.BuildParams apply plugin: 'opensearch.testclusters' @@ -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 fa784ed7f47ccfc22536919ab5a719d0a1f6c8b1 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 16 Jun 2023 11:07:34 -0400 Subject: [PATCH 4/6] Fix ignores Signed-off-by: Stephen Crawford --- qa/evil-tests/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index d64462757ba65..3d97aab077251 100644 --- a/qa/evil-tests/build.gradle +++ b/qa/evil-tests/build.gradle @@ -62,6 +62,7 @@ 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 9251c7e69e875f827d8e1e0023e62b5fa4a4e43e Mon Sep 17 00:00:00 2001 From: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:32:35 -0400 Subject: [PATCH 5/6] Update plugins/repository-gcs/build.gradle Co-authored-by: Andriy Redko Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> --- plugins/repository-gcs/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 392d554111d68..5d7a4c64ae34a 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -54,7 +54,7 @@ versions << [ dependencies { api 'com.google.cloud:google-cloud-storage:1.113.1' api 'com.google.cloud:google-cloud-core:2.5.10' - runtimeOnly 'com.google.guava:guava:32.0.1-jre' + runtimeOnly "com.google.guava:guava:${versions.guava}" api 'com.google.guava:failureaccess:1.0.1' api 'com.google.http-client:google-http-client:1.43.2' api "commons-logging:commons-logging:${versions.commonslogging}" From cc4c3086e9fdfd1c8961b18ceb0b149dcaad37da Mon Sep 17 00:00:00 2001 From: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Date: Fri, 16 Jun 2023 13:15:00 -0400 Subject: [PATCH 6/6] Update plugins/repository-azure/build.gradle Co-authored-by: Andriy Redko Signed-off-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> --- plugins/repository-azure/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 2372570ba9fd9..da61be7b5cfc4 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -69,7 +69,7 @@ dependencies { api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}" api 'org.codehaus.woodstox:stax2-api:4.2.1' implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" - runtimeOnly 'com.google.guava:guava:32.0.1-jre' + runtimeOnly "com.google.guava:guava:${versions.guava}" api 'org.apache.commons:commons-lang3:3.12.0' testImplementation project(':test:fixtures:azure-fixture') }