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

Bump Mockito dependencies #1711

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Conversation

reta
Copy link
Contributor

@reta reta commented Nov 29, 2023

Description

Bump Mockito dependencies

Issues Resolved

N/A

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.

Copy link

codecov bot commented Nov 29, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (d71c77f) 81.90% compared to head (c35d685) 81.94%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1711      +/-   ##
============================================
+ Coverage     81.90%   81.94%   +0.04%     
- Complexity     4391     4396       +5     
============================================
  Files           421      421              
  Lines         17438    17438              
  Branches       1853     1853              
============================================
+ Hits          14283    14290       +7     
+ Misses         2417     2411       -6     
+ Partials        738      737       -1     
Flag Coverage Δ
ml-commons 81.94% <ø> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:16 — with GitHub Actions Inactive
@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:16 — with GitHub Actions Inactive
@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:16 — with GitHub Actions Inactive
@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:23 — with GitHub Actions Inactive
@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:23 — with GitHub Actions Inactive
@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:23 — with GitHub Actions Inactive
@reta reta temporarily deployed to ml-commons-cicd-env December 19, 2023 21:23 — with GitHub Actions Inactive
@ylwu-amzn ylwu-amzn merged commit e3a8a59 into opensearch-project:main Jan 12, 2024
9 of 14 checks passed
@ylwu-amzn
Copy link
Collaborator

@reta , should we backport this to 2.x branch ? If yes, can you help add backport 2.x label and backport to 2.x?

@reta
Copy link
Contributor Author

reta commented Jan 12, 2024

@reta , should we backport this to 2.x branch ? If yes, can you help add backport 2.x label and backport to 2.x?

Thanks @ylwu-amzn ! Yes, we need to backport but I cannot add labels (only maintainers could do that), sorry about it

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1711-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3a8a5925092db6018124323924b8157b3bf44e9
# Push it to GitHub
git push --set-upstream origin backport/backport-1711-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1711-to-2.x.

@ylwu-amzn
Copy link
Collaborator

@reta , should we backport this to 2.x branch ? If yes, can you help add backport 2.x label and backport to 2.x?

Thanks @ylwu-amzn ! Yes, we need to backport but I cannot add labels (only maintainers could do that), sorry about it

Got it, I added the label. But seems there are some conflicts, you need to backport manually @reta

reta added a commit to reta/ml-commons that referenced this pull request Jan 12, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit to reta/ml-commons that referenced this pull request Jan 15, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit to reta/ml-commons that referenced this pull request Jan 15, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
ylwu-amzn pushed a commit that referenced this pull request Jan 17, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Mar 19, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants