Skip to content

Commit 58fc68e

Browse files
authored
[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 <cwperx@amazon.com> * Add CHANGELOG entry Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove double hyphen Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> (cherry picked from commit 5642ce7) * Update repository-gcs/build.gradlee Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 4742400 commit 58fc68e

File tree

5 files changed

+3
-5
lines changed

5 files changed

+3
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
99

1010
### Dependencies
1111
- Bump `com.azure:azure-identity` from 1.13.0 to 1.13.2 ([#15578](https://github.com/opensearch-project/OpenSearch/pull/15578))
12+
- Bump `protobuf` from 3.22.3 to 3.25.4 ([#15684](https://github.com/opensearch-project/OpenSearch/pull/15684))
1213

1314
### Changed
1415

buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ woodstox = 6.4.0
2020
kotlin = 1.7.10
2121
antlr4 = 4.13.1
2222
guava = 32.1.1-jre
23-
protobuf = 3.22.3
23+
protobuf = 3.25.4
2424
jakarta_annotation = 1.3.5
2525
google_http_client = 1.44.1
2626
tdigest = 3.2

plugins/repository-gcs/build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ thirdPartyAudit {
148148
'com.google.appengine.api.urlfetch.HTTPResponse',
149149
'com.google.appengine.api.urlfetch.URLFetchService',
150150
'com.google.appengine.api.urlfetch.URLFetchServiceFactory',
151-
'com.google.protobuf.MapFieldBuilder',
152-
'com.google.protobuf.MapFieldBuilder$Converter',
153-
'com.google.protobuf.MapFieldReflectionAccessor',
154151
'com.google.protobuf.util.JsonFormat',
155152
'com.google.protobuf.util.JsonFormat$Parser',
156153
'com.google.protobuf.util.JsonFormat$Printer',

server/licenses/protobuf-java-3.22.3.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
43fcb86e4a411516c7fc681450f1516de0b862a2

0 commit comments

Comments
 (0)