Upgrade spring-core from 5.3.26 to 5.3.27.#2717
Conversation
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
|
@Rishikesh1159 Can you re-base or merge the latest commits from |
Sure |
|
The CI failure is cased by opensearch-project/OpenSearch#7286. We are awaiting until the new snapshot is released with the corrected version. |
|
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-2717-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 54d47ab181c4c782af37c96521238f7dbaf50cb2
# Push it to GitHub
git push --set-upstream origin backport/backport-2717-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.xThen, 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-2717-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 54d47ab181c4c782af37c96521238f7dbaf50cb2
# Push it to GitHub
git push --set-upstream origin backport/backport-2717-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3Then, create a pull request where the |
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com> (cherry picked from commit 54d47ab)
…pensearch-project#2763) Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com> (cherry picked from commit 54d47ab) Co-authored-by: Rishikesh Pasham <62345295+Rishikesh1159@users.noreply.github.com>
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com> Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com> Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
This mirrors the changes in main (opensearch-project#2717) and 2.x (opensearch-project#2763). The backport workflow was not used because there have been major changes to the build file between 1.x and 2.x Signed-off-by: Kartik Ganesh <gkart@amazon.com> Bump spring-core to 5.3.28 Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Kartik Ganesh <gkart@amazon.com> Also bumping spring-expression to 5.3.28 Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Kartik Ganesh <gkart@amazon.com>
This mirrors the changes in main (opensearch-project#2717) and 2.x (opensearch-project#2763). The backport workflow was not used because there have been major changes to the build file between 1.x and 2.x Signed-off-by: Kartik Ganesh <gkart@amazon.com> Bump spring-core to 5.3.28 Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Kartik Ganesh <gkart@amazon.com> Also bumping spring-expression to 5.3.28 Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Kartik Ganesh <gkart@amazon.com> Signed-off-by: Dave Lago <davelago@amazon.com>
#2873) This mirrors the changes in main (#2717) and 2.x (#2763). The backport workflow was not used because there have been major changes to the build file between 1.x and 2.x Bump spring-core to 5.3.28 Also bumping spring-expression to 5.3.28 Signed-off-by: Kartik Ganesh <gkart@amazon.com> Signed-off-by: Dave Lago <davelago@amazon.com> Co-authored-by: Kartik Ganesh <gkart@amazon.com> Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com> Signed-off-by: Sam <samuel.costa@eliatra.com>
Description
[Describe what this change achieves]
Upgrade spring-core from 5.3.26 to 5.3.27 to fix CVE-2023-20863
Issues Resolved
CVE-2023-20863
Is this a backport? If so, please add backport PR # and/or commits #
Testing
[Please provide details of testing done: unit testing, integration testing and manual testing]
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.