[1.3] Upgrades protobuf-java to 3.22.5 (#16779)

* Upgrades protobuf-java to 3.22.5 Signed-off-by: Owais <[email protected]> * Adds CHANGELOG Signed-off-by: Owais <[email protected]> --------- Signed-off-by: Owais <[email protected]>
opensearch-project · Dec 4, 2024 · 22297cf · 22297cf
1 parent 8551eb2
commit 22297cf
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bump `org.bouncycastle:bc-fips` from 1.0.2.4 to 1.0.2.5 ([#13446](https://github.com/opensearch-project/OpenSearch/pull/13446))
 - Bump `Netty` from 4.1.114.Final to 4.1.115.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661))
 - 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))
 
 ### 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.3
+protobuf          = 3.22.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
@@ -62,7 +62,7 @@ dependencies {
   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:3.21.7'
+  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'
   api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'

diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.21.7.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
@@ -0,0 +1 @@
+fdee98b8f6abab73f146a4edb4c09e56f8278d03
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -67,7 +67,7 @@ dependencies {
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
   api 'com.google.code.gson:gson:2.9.0'
   runtimeOnly "com.google.guava:guava:${versions.guava}"
-  api 'com.google.protobuf:protobuf-java:3.21.9'
+  api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api 'commons-logging:commons-logging:1.1.3'
   api 'commons-cli:commons-cli:1.2'
   api "commons-codec:commons-codec:${versions.commonscodec}"

diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1
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
@@ -0,0 +1 @@
+fdee98b8f6abab73f146a4edb4c09e56f8278d03