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.

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

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Apr 6, 2023

Description

Backport PR #6994 / commit 53b128f to 2.x branch

There are 3 Gradle sub-projects declared protobuf-java dependency. They have got different version due to upgrade alone.
This PR will unify the version of library protobuf-java used in OpenSearch.

Changed the version for the below 3 libraries in 2 directories.
plugins/repository-gcs/build.gradle :

api 'com.google.protobuf:protobuf-java-util:3.22.2'
api 'com.google.protobuf:protobuf-java:3.22.2'

test/fixtures/hdfs-fixture/build.gradle :

api 'com.google.protobuf:protobuf-java:3.22.2'

There is another protobuf-java dependency declared in plugins/repository-hdfs/build.gradle, the version is already 3.22.2.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

* Bump version of protobuf-java to 3.22.2

Signed-off-by: Tianli Feng <ftianli@amazon.com>

(cherry picked from commit 53b128f)
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng added backport PRs or issues specific to backporting features or enhancments dependencies Pull requests that update a dependency file v2.7.0 labels Apr 6, 2023
tlfeng

This comment was marked as outdated.

@@ -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

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

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

@github-actions
Copy link
Contributor

github-actions bot commented Apr 6, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=pit/10_basic/Delete all}

@codecov-commenter
Copy link

Codecov Report

Merging #7024 (f3a73e9) into 2.x (2ce07f2) will decrease coverage by 0.05%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x    #7024      +/-   ##
============================================
- Coverage     70.45%   70.40%   -0.05%     
+ Complexity    59520    59510      -10     
============================================
  Files          4822     4822              
  Lines        285910   285910              
  Branches      41551    41551              
============================================
- Hits         201424   201308     -116     
- Misses        67656    67759     +103     
- Partials      16830    16843      +13     

see 475 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@tlfeng tlfeng merged commit d95effb into opensearch-project:2.x Apr 6, 2023
@tlfeng tlfeng deleted the 2.x-protobuf-java-3.22.2 branch April 6, 2023 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport PRs or issues specific to backporting features or enhancments dependencies Pull requests that update a dependency file v2.7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants