[1.3] Version bump for protobuf, snappy-java (#16792)

* Bump protobuf-java to 3.25.5 Signed-off-by: Daniel Widdis <[email protected]> * Bump snappy-java to 1.1.10.7 Signed-off-by: Daniel Widdis <[email protected]> * Add CHANGELOG Signed-off-by: Daniel Widdis <[email protected]> * Update SHAs Signed-off-by: Daniel Widdis <[email protected]> --------- Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Dec 6, 2024 · 9e291ce · 9e291ce
1 parent 6c40db0
commit 9e291ce
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 6 deletions.
diff --git 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

diff --git 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
@@ -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'

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
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
@@ -0,0 +1 @@
+5ae5c9ec39930ae9b5a61b32b93288818ec05ec1
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
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
@@ -0,0 +1 @@
+38cc5ce479603e36466feda2a9f1dfdb2210ef00
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
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
@@ -0,0 +1 @@
+5ae5c9ec39930ae9b5a61b32b93288818ec05ec1
diff --git 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"
 }