Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Bump version of protobuf-java to 3.22.2 (#6994) #7024

Merged
merged 1 commit into from
Apr 6, 2023
Merged

[Backport 2.x] Bump version of protobuf-java to 3.22.2 (#6994) #7024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Dependencies
- Bump `org.apache.logging.log4j:log4j-core` from 2.18.0 to 2.20.0 ([#6490](https://github.com/opensearch-project/OpenSearch/pull/6490))
- Bump `com.azure:azure-storage-common` from 12.19.3 to 12.20.0 ([#6492](https://github.com/opensearch-project/OpenSearch/pull/6492)
- Bump `com.azure:azure-storage-blob` from 12.15.0 to 12.20.0 ([#6921](https://github.com/opensearch-project/OpenSearch/pull/6921)
Copy link
Collaborator Author

@tlfeng tlfeng Apr 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: Deleted Line 28 because Line 41 saying the same, and removing this line makes it identical with main branch

OpenSearch/CHANGELOG.md

Line 116 in 53b128f

- Bump `com.azure:azure-storage-blob` from 12.15.0 to 12.21.1

- Bump `snakeyaml` from 1.33 to 2.0 ([#6511](https://github.com/opensearch-project/OpenSearch/pull/6511))
- Bump `io.projectreactor.netty:reactor-netty` from 1.1.3 to 1.1.4
- Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.15.2 to 0.16.11
- Bump `net.minidev:json-smart` from 2.4.8 to 2.4.9
- Bump `com.google.protobuf:protobuf-java` from 3.22.0 to 3.22.2
- Bump `com.google.protobuf:protobuf-java` to 3.22.2 ([#6994](https://github.com/opensearch-project/OpenSearch/pull/6994))
- Bump Netty to 4.1.90.Final ([#6677](https://github.com/opensearch-project/OpenSearch/pull/6677)
- Bump `com.diffplug.spotless` from 6.15.0 to 6.17.0
- Bump `org.apache.zookeeper:zookeeper` from 3.8.0 to 3.8.1
Expand Down
4 changes: 2 additions & 2 deletions plugins/repository-gcs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ 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.20.0'
api 'com.google.protobuf:protobuf-java:3.21.7'
api 'com.google.protobuf:protobuf-java-util:3.22.2'
api 'com.google.protobuf:protobuf-java:3.22.2'
api 'com.google.code.gson:gson:2.9.0'
api 'com.google.api.grpc:proto-google-common-protos:2.10.0'
api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/protobuf-java-3.22.2.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fdee98b8f6abab73f146a4edb4c09e56f8278d03
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/protobuf-java-util-3.20.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/protobuf-java-util-3.22.2.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
749cd4fe8ab52f37bc186193802ba19f5b284647
2 changes: 1 addition & 1 deletion test/fixtures/hdfs-fixture/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
api 'net.minidev:json-smart:2.4.9'
api "org.mockito:mockito-core:${versions.mockito}"
api "com.google.protobuf:protobuf-java:3.21.9"
api "com.google.protobuf:protobuf-java:3.22.2"
api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
api 'org.eclipse.jetty:jetty-server:9.4.49.v20220914'
api 'org.apache.zookeeper:zookeeper:3.8.1'
Expand Down