From 58fc68e440bbd6864c18d52b2015a86868113100 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 9 Sep 2024 13:55:05 -0400 Subject: [PATCH] [Backport 2.x] Update protobuf from 3.22.3 to 3.25.4 (#15864) * Update protobuf from 3.22.3 to 3.25.4 (#15684) * Update protobuf from 3.22.3 to 3.25.4 Signed-off-by: Craig Perkins * Add CHANGELOG entry Signed-off-by: Craig Perkins * Remove double hyphen Signed-off-by: Craig Perkins --------- Signed-off-by: Craig Perkins (cherry picked from commit 5642ce7b4a432e25e6d71ceab961165bcd7eaad4) * Update repository-gcs/build.gradlee Signed-off-by: Craig Perkins --------- Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + buildSrc/version.properties | 2 +- plugins/repository-gcs/build.gradle | 3 --- server/licenses/protobuf-java-3.22.3.jar.sha1 | 1 - server/licenses/protobuf-java-3.25.4.jar.sha1 | 1 + 5 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 server/licenses/protobuf-java-3.22.3.jar.sha1 create mode 100644 server/licenses/protobuf-java-3.25.4.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f9811fcc4c96..1636e6c6964cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Dependencies - Bump `com.azure:azure-identity` from 1.13.0 to 1.13.2 ([#15578](https://github.com/opensearch-project/OpenSearch/pull/15578)) +- Bump `protobuf` from 3.22.3 to 3.25.4 ([#15684](https://github.com/opensearch-project/OpenSearch/pull/15684)) ### Changed diff --git a/buildSrc/version.properties b/buildSrc/version.properties index fce5e4a194837..ea04bd1e33d4a 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -20,7 +20,7 @@ woodstox = 6.4.0 kotlin = 1.7.10 antlr4 = 4.13.1 guava = 32.1.1-jre -protobuf = 3.22.3 +protobuf = 3.25.4 jakarta_annotation = 1.3.5 google_http_client = 1.44.1 tdigest = 3.2 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 8beec1d571f3b..ab651ff9939fd 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -148,9 +148,6 @@ thirdPartyAudit { 'com.google.appengine.api.urlfetch.HTTPResponse', 'com.google.appengine.api.urlfetch.URLFetchService', 'com.google.appengine.api.urlfetch.URLFetchServiceFactory', - 'com.google.protobuf.MapFieldBuilder', - 'com.google.protobuf.MapFieldBuilder$Converter', - 'com.google.protobuf.MapFieldReflectionAccessor', 'com.google.protobuf.util.JsonFormat', 'com.google.protobuf.util.JsonFormat$Parser', 'com.google.protobuf.util.JsonFormat$Printer', diff --git a/server/licenses/protobuf-java-3.22.3.jar.sha1 b/server/licenses/protobuf-java-3.22.3.jar.sha1 deleted file mode 100644 index 80feeec023e7b..0000000000000 --- a/server/licenses/protobuf-java-3.22.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fdee98b8f6abab73f146a4edb4c09e56f8278d03 \ No newline at end of file diff --git a/server/licenses/protobuf-java-3.25.4.jar.sha1 b/server/licenses/protobuf-java-3.25.4.jar.sha1 new file mode 100644 index 0000000000000..21b6fdfd24dc8 --- /dev/null +++ b/server/licenses/protobuf-java-3.25.4.jar.sha1 @@ -0,0 +1 @@ +43fcb86e4a411516c7fc681450f1516de0b862a2 \ No newline at end of file