-
Notifications
You must be signed in to change notification settings - Fork 282
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
Remediate CVE-2023-1370 and CVE-2023-20861 via version bumps #2606
Remediate CVE-2023-1370 and CVE-2023-20861 via version bumps #2606
Conversation
Signed-off-by: Stephen Crawford <[email protected]>
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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-2606-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9bcf4a432c6a66a16972d62d2fc0fe40328feb65
# Push it to GitHub
git push --set-upstream origin backport/backport-2606-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x 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.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-2606-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9bcf4a432c6a66a16972d62d2fc0fe40328feb65
# Push it to GitHub
git push --set-upstream origin backport/backport-2606-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 |
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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2606-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9bcf4a432c6a66a16972d62d2fc0fe40328feb65
# Push it to GitHub
git push --set-upstream origin backport/backport-2606-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 |
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.6 2.6
# Navigate to the new working tree
cd .worktrees/backport-2.6
# Create a new branch
git switch --create backport/backport-2606-to-2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9bcf4a432c6a66a16972d62d2fc0fe40328feb65
# Push it to GitHub
git push --set-upstream origin backport/backport-2606-to-2.6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.6 Then, create a pull request where the |
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]> Signed-off-by: Maciej Mierzwa <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]> Signed-off-by: Maciej Mierzwa <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]> Signed-off-by: Maciej Mierzwa <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]> Signed-off-by: Maciej Mierzwa <[email protected]>
Description
Bumps JSON-Smart to version 2.4.10 to address CVE-2023-1370.
Bumps Spring-core to version 5.3.26 to address CVE-2023-20861.
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.