From ac90acbd9d1a89270982e5446b71df54cbbf07fd Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 16 Jun 2023 14:28:20 -0400 Subject: [PATCH 1/2] Backport guava Signed-off-by: Stephen Crawford --- CHANGELOG.md | 2 +- 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 + 12 files changed, 8 insertions(+), 8 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/CHANGELOG.md b/CHANGELOG.md index 4ca1039ef639e..481566f3bccbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `com.diffplug.spotless` from 6.18.0 to 6.19.0 (#8007) - Bump `'com.azure:azure-storage-blob` to 12.22.2 from 12.21.1 ([#8043](https://github.com/opensearch-project/OpenSearch/pull/8043)) - Bump `org.jruby.joni:joni` from 2.1.48 to 2.2.1 (#8015) -- Bump `com.google.guava:guava` from 32.0.0-jre to 32.0.1-jre ([#8011](https://github.com/opensearch-project/OpenSearch/pull/8011), [#8012](https://github.com/opensearch-project/OpenSearch/pull/8012)) +- Bump `com.google.guava:guava` from 32.0.0-jre to 32.0.1-jre ([#8011](https://github.com/opensearch-project/OpenSearch/pull/8011), [#8012](https://github.com/opensearch-project/OpenSearch/pull/8012), [#8107](https://github.com/opensearch-project/OpenSearch/pull/8107)) - Bump `io.projectreactor:reactor-core` from 3.4.18 to 3.5.6 in /plugins/repository-azure ([#8016](https://github.com/opensearch-project/OpenSearch/pull/8016)) ### Changed diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 00b6da1b43cf0..a9c895546bf37 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -20,7 +20,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 66016f4d4146c..e2306eb41834e 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 d61ba45535e94..5e1a3f9d5b5d6 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -56,7 +56,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.35.0' 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 bb19fdcdae2c3d832d0e959c695e6c5977d28ed8 Mon Sep 17 00:00:00 2001 From: Stephen Crawford Date: Fri, 16 Jun 2023 14:52:47 -0400 Subject: [PATCH 2/2] fix exclusions 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 - 4 files changed, 4 deletions(-) diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index a41e6d668241b..1458eacb66d77 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 e2306eb41834e..852ca9b3043cc 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 5e1a3f9d5b5d6..6546f2e33f060 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -112,7 +112,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 fdd3ca4c829df..72bc93ed2ac79 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',