Add import ordering to Spotless formatting rules#3666
Merged
willyborankin merged 1 commit intoopensearch-project:mainfrom Nov 7, 2023
Merged
Add import ordering to Spotless formatting rules#3666willyborankin merged 1 commit intoopensearch-project:mainfrom
willyborankin merged 1 commit intoopensearch-project:mainfrom
Conversation
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta
commented
Nov 7, 2023
willyborankin
approved these changes
Nov 7, 2023
stephen-crawford
approved these changes
Nov 7, 2023
Collaborator
|
@scrawfor99 and @reta backport it to 2.x? |
Contributor
|
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/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3666-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 905c97d4fed185362a12c4b46aa56ad8febabb4d
# Push it to GitHub
git push --set-upstream origin backport/backport-3666-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.xThen, create a pull request where the |
reta
added a commit
to reta/security
that referenced
this pull request
Nov 7, 2023
…3666) We have added Spotless formatting rules already, this pull request adds import ordering to Spotless formatting rules Follow up on opensearch-project#3651 N/A - [ ] New functionality includes testing - [ ] New functionality has been documented - [X] Commits are signed per the DCO using --signoff 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 905c97d)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
We have added Spotless formatting rules already, this pull request adds import ordering to Spotless formatting rules
Issues Resolved
Follow up on #3651
Testing
N/A
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.