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.2] Upgrade dependencies #4166

Merged
merged 2 commits into from
Aug 8, 2022

Conversation

kartg
Copy link
Member

@kartg kartg commented Aug 8, 2022

Description

Backport of #4047 to the 2.2 branch. I've removed the SegmentReplicationIT class since that was never backported from #3743

Issues Resolved

closes #4161

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

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.

VachaShah and others added 2 commits August 8, 2022 12:24
* Upgrading dependencies for hadoop and aws-java-sdk

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Fixing precommit

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Upgrading transitive dependencies

Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Excluding transitive dependencies

Signed-off-by: Vacha Shah <vachshah@amazon.com>
(cherry picked from commit 88f5537)
(cherry picked from commit 7d92565)
The original change included a javadoc update to the IT class, but the test class was never backported from opensearch-project#3743 to 2.x. Since the scope of this change is to backport dependency upgrades only, this class has been removed.

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
(cherry picked from commit d6ead92)
@kartg kartg marked this pull request as ready for review August 8, 2022 19:42
@kartg kartg requested review from a team and reta as code owners August 8, 2022 19:42
@peterzhuamazon peterzhuamazon changed the title [Backport] Upgrade dependencies [Backport 2.2] Upgrade dependencies Aug 8, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2022

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2022

Gradle Check (Jenkins) Run Completed with:

@kartg
Copy link
Member Author

kartg commented Aug 8, 2022

Looks like #4162

Refiring

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2022

Gradle Check (Jenkins) Run Completed with:

@kartg kartg merged commit b1017fa into opensearch-project:2.2 Aug 8, 2022
@kartg kartg deleted the backport-4165-to-2.2 branch August 8, 2022 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants