-
Notifications
You must be signed in to change notification settings - Fork 283
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
Update to most recent verson of jackson-databind #1679
Conversation
Signed-off-by: Peter Nied <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #1679 +/- ##
=========================================
Coverage 62.92% 62.92%
Complexity 3259 3259
=========================================
Files 253 253
Lines 18127 18127
Branches 3258 3258
=========================================
Hits 11406 11406
Misses 5072 5072
Partials 1649 1649 Continue to review full report at Codecov.
|
Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit 9967fb1)
Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit 9967fb1)
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-1.0 1.0
# Navigate to the new working tree
cd .worktrees/backport-1.0
# Create a new branch
git switch --create backport/backport-1679-to-1.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9967fb1e889c2459bccafe01b187ef6ba8b7992d
# Push it to GitHub
git push --set-upstream origin backport/backport-1679-to-1.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.0 Then, create a pull request where the |
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-1.2 1.2
# Navigate to the new working tree
cd .worktrees/backport-1.2
# Create a new branch
git switch --create backport/backport-1679-to-1.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9967fb1e889c2459bccafe01b187ef6ba8b7992d
# Push it to GitHub
git push --set-upstream origin backport/backport-1679-to-1.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.2 Then, create a pull request where the |
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-1.1 1.1
# Navigate to the new working tree
cd .worktrees/backport-1.1
# Create a new branch
git switch --create backport/backport-1679-to-1.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9967fb1e889c2459bccafe01b187ef6ba8b7992d
# Push it to GitHub
git push --set-upstream origin backport/backport-1679-to-1.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.1 Then, create a pull request where the |
Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit 9967fb1) Co-authored-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit 9967fb1) Co-authored-by: Peter Nied <[email protected]>
@cliu123 This change cannot be backported to 1.0, 1.1, 1.2, or 1.3 because OpenSearch already ships this binary and it would cause an issue when attempting to install the plugin |
@peternied oops! So we should revert this backport PR? #1693 |
@cliu123 Yes we should |
…project#1679) (opensearch-project#1693)" This reverts commit 260f540. Signed-off-by: cliu123 <[email protected]>
@peternied Good catch! Thanks for pointing this out! : ) I'll wait for a bit to confirm if this will be backported to all the old branches for the next potential patch versions. If not, I'll revert it from 1.3 branch. |
The decision hasn't been finalized yet. I'll revert this from 1.3 branch for now. |
Backporting from 1.3 branch: #1696 |
…)" (#1696) This reverts commit 260f540. Signed-off-by: cliu123 <[email protected]>
…1679) Signed-off-by: Peter Nied <[email protected]>
Signed-off-by: Peter Nied [email protected]
Description
Fixes https://www.whitesourcesoftware.com/vulnerability-database/CVE-2020-36518
Check List
New functionality includes testingNew functionality has been documentedBy 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.