From 2a5d38ad76a5c7730656a5c097ad9df1c34fdd72 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Thu, 5 Dec 2024 10:26:58 -0800 Subject: [PATCH 1/4] Bump protobuf-java to 3.25.5 Signed-off-by: Daniel Widdis --- buildSrc/version.properties | 2 +- plugins/repository-gcs/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 901c1fa2066ea..bd02287298fb4 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -21,7 +21,7 @@ asm = 9.5 woodstox = 6.4.0 kotlin = 1.7.10 guava = 32.0.1-jre -protobuf = 3.22.5 +protobuf = 3.25.5 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index ae2d3f1f72060..3e410f9f6f5c5 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -61,7 +61,7 @@ dependencies { api 'com.google.api:api-common:1.8.1' api 'com.google.api:gax:1.54.0' api 'org.threeten:threetenbp:1.4.4' - api 'com.google.protobuf:protobuf-java-util:3.19.3' + api 'com.google.protobuf:protobuf-java-util:3.25.5' api "com.google.protobuf:protobuf-java:${versions.protobuf}" api 'com.google.code.gson:gson:2.8.9' api 'com.google.api.grpc:proto-google-common-protos:1.16.0' From 11e888b7ea8770c5419e202f50f9b8596b062221 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Thu, 5 Dec 2024 10:35:38 -0800 Subject: [PATCH 2/4] Bump snappy-java to 1.1.10.7 Signed-off-by: Daniel Widdis --- test/fixtures/hdfs-fixture/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 82c60eb102c67..dd6d782ecc109 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -72,5 +72,5 @@ dependencies { exclude group: "com.squareup.okio" } runtimeOnly "com.squareup.okio:okio:3.5.0" - runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.3" + runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.7" } From 74f9ebf171714a955484f637de79d765d78c5c40 Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Thu, 5 Dec 2024 11:17:05 -0800 Subject: [PATCH 3/4] Add CHANGELOG Signed-off-by: Daniel Widdis --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3419220361939..e5aea456c481c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `avro` from 1.11.3 to 1.11.4 ([#16773](https://github.com/opensearch-project/OpenSearch/pull/16773)) - Bump `protobuf-java` to 3.22.5 ([#16779](https://github.com/opensearch-project/OpenSearch/pull/16779)) - Bump `commonsio` to 2.16.0 ([#16780](https://github.com/opensearch-project/OpenSearch/pull/16780)) +- Bump `protobuf-java` to 3.25.5 ([#16792](https://github.com/opensearch-project/OpenSearch/pull/16792)) +- Bump `snappy-java` to 1.1.10.7 ([#16792](https://github.com/opensearch-project/OpenSearch/pull/16792)) ### Changed ### Deprecated From 0862d49cb7bbd2a92815ca861515f104b6979a0d Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Thu, 5 Dec 2024 11:17:29 -0800 Subject: [PATCH 4/4] Update SHAs Signed-off-by: Daniel Widdis --- plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 | 1 - plugins/repository-gcs/licenses/protobuf-java-3.25.5.jar.sha1 | 1 + .../repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 | 1 - .../repository-gcs/licenses/protobuf-java-util-3.25.5.jar.sha1 | 1 + plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 | 1 - plugins/repository-hdfs/licenses/protobuf-java-3.25.5.jar.sha1 | 1 + 6 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/protobuf-java-3.25.5.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/protobuf-java-util-3.25.5.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/protobuf-java-3.25.5.jar.sha1 diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 deleted file mode 100644 index 80feeec023e7b..0000000000000 --- a/plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fdee98b8f6abab73f146a4edb4c09e56f8278d03 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.25.5.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.25.5.jar.sha1 new file mode 100644 index 0000000000000..72b42c9efc85a --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-3.25.5.jar.sha1 @@ -0,0 +1 @@ +5ae5c9ec39930ae9b5a61b32b93288818ec05ec1 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 deleted file mode 100644 index 9ba36d444c541..0000000000000 --- a/plugins/repository-gcs/licenses/protobuf-java-util-3.19.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3e6812cbbb7e6faffa7b56438740dec510e1fc1a \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/protobuf-java-util-3.25.5.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-util-3.25.5.jar.sha1 new file mode 100644 index 0000000000000..51fa931d7ab7d --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-util-3.25.5.jar.sha1 @@ -0,0 +1 @@ +38cc5ce479603e36466feda2a9f1dfdb2210ef00 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 deleted file mode 100644 index 80feeec023e7b..0000000000000 --- a/plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fdee98b8f6abab73f146a4edb4c09e56f8278d03 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.25.5.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.25.5.jar.sha1 new file mode 100644 index 0000000000000..72b42c9efc85a --- /dev/null +++ b/plugins/repository-hdfs/licenses/protobuf-java-3.25.5.jar.sha1 @@ -0,0 +1 @@ +5ae5c9ec39930ae9b5a61b32b93288818ec05ec1 \ No newline at end of file