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

Version Bump: spring-beans-5.2.19 -> spring-beans-5.2.20 #527

Merged
merged 1 commit into from
Apr 5, 2022

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Apr 1, 2022

Signed-off-by: penghuo penghuo@gmail.com

Issues Resolved

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

@penghuo penghuo added v2.0.0 security fix Security fix generated by WhiteSource labels Apr 1, 2022
@penghuo penghuo requested a review from a team as a code owner April 1, 2022 23:33
@penghuo penghuo self-assigned this Apr 1, 2022
dai-chen
dai-chen previously approved these changes Apr 1, 2022
Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

Thanks for the fix! Do we need to bump 'spring-test' just in case?

joshuali925
joshuali925 previously approved these changes Apr 2, 2022
Signed-off-by: penghuo <penghuo@gmail.com>
@penghuo
Copy link
Collaborator Author

penghuo commented Apr 4, 2022

Thanks for the fix! Do we need to bump 'spring-test' just in case?

Sure.

@penghuo penghuo merged commit 5170a6e into opensearch-project:main Apr 5, 2022
vamsi-amazon pushed a commit that referenced this pull request Apr 19, 2022
Signed-off-by: penghuo <penghuo@gmail.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-527-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5170a6e46bba286403763e4546d97593daaa0bfd
# Push it to GitHub
git push --set-upstream origin backport/backport-527-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-527-to-1.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 security fix Security fix generated by WhiteSource v2.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants