-
Notifications
You must be signed in to change notification settings - Fork 94
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
[Backport 2.x] Update dependency com.pinterest:ktlint to 0.47.1 and fix CVE-2023-6378 for common-utils #588
Conversation
Signed-off-by: Joanne Wang <[email protected]>
Signed-off-by: jowg-amazon <[email protected]>
Signed-off-by: jowg-amazon <[email protected]>
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.5 2.5
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.5
# Create a new branch
git switch --create backport-588-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.5
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.5 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.7 2.7
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.7
# Create a new branch
git switch --create backport-588-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.7
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.7 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.9 2.9
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.9
# Create a new branch
git switch --create backport-588-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.9
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.9 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.11
# Create a new branch
git switch --create backport-588-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fed683893f43274171f8615174f98d82d7b54f1f
# Push it to GitHub
git push --set-upstream origin backport-588-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.11 Then, create a pull request where the |
CVE-2023-6378 for common-utils (opensearch-project#588) * add logback-classic for CVE-2023-6378 Signed-off-by: Joanne Wang <[email protected]> * updated com.pinterest:ktlint to v0.47.1 Signed-off-by: jowg-amazon <[email protected]> * ran ./gradlew ktlintformat Signed-off-by: jowg-amazon <[email protected]> --------- Signed-off-by: Joanne Wang <[email protected]> Signed-off-by: jowg-amazon <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
Description
Manual Backport of #585 to 2.x
Cherry picked
418f56f97745f999d951a201caee3808802cb3a8
and816235c090c27716255312dd2d216f6b007f6e18
then ran./gradlew ktlintformat
to fix ktlint.Issues Resolved
[List any issues this PR will resolve]
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.