Skip to content

Commit

Permalink
[Backport 2.x] Update protobuf from 3.22.3 to 3.25.4 (#15864)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
cwperks authored Sep 9, 2024
1 parent 4742400 commit 58fc68e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion server/licenses/protobuf-java-3.22.3.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/protobuf-java-3.25.4.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
43fcb86e4a411516c7fc681450f1516de0b862a2

0 comments on commit 58fc68e

Please sign in to comment.