-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Bumps snakeyaml to 2.0 #6511
Bumps snakeyaml to 2.0 #6511
Conversation
457c00b
to
ca94902
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
📣 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 @@
## main #6511 +/- ##
============================================
+ Coverage 70.64% 70.81% +0.16%
- Complexity 59005 59134 +129
============================================
Files 4802 4802
Lines 282967 282967
Branches 40793 40793
============================================
+ Hits 199889 200370 +481
+ Misses 66648 66188 -460
+ Partials 16430 16409 -21
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
CHANGELOG.md
Outdated
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | |||
- Bump `joni` from 2.1.44 to 2.1.45 | |||
- Bump `commons-io:commons-io` from 2.7 to 2.11.0 | |||
- Bump `org.jruby.joni:joni` from 2.1.45 to 2.1.48 | |||
- Bump `snakeyaml` from 1.33 to 2.0 ([#6511](https://github.com/opensearch-project/OpenSearch/pull/6511)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you plan to backport this change to 2.x?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, please do backport (and move this to the 2.x section in this PR prior to the backport).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pushed the change!
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
@owaiskazi19 Can you rebase this? |
Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com>
4ff72b7
to
88d2cd8
Compare
Gradle Check (Jenkins) Run Completed with:
|
The backport to
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
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-6511-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8bda365902ae665bc2082d5b6932b28a1fcb4803
# Push it to GitHub
git push --set-upstream origin backport/backport-6511-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
Backport failed due to changelog divergence. Fix: #6518 |
@owaiskazi19 @saratvemulapalli Should this be backported to 1.3? |
* Bumps snakeyaml to 2.0 Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com> * Moved changelog under 2.x Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com> --------- Signed-off-by: owaiskazi19 <owaiskazi19@gmail.com> Signed-off-by: Mingshi Liu <mingshl@amazon.com>
Description
Snakeyaml released the version
2.0
which also addresses the CVE-2022-1471.Issues Resolved
#5576
Check List
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.