Skip to content
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

Add import ordering to Spotless formatting rules #3666

Merged
merged 1 commit into from
Nov 7, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Nov 7, 2023

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

  • New functionality includes testing
  • New functionality has been documented
  • 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.

@willyborankin willyborankin merged commit 905c97d into opensearch-project:main Nov 7, 2023
75 checks passed
@willyborankin
Copy link
Collaborator

@scrawfor99 and @reta backport it to 2.x?

@reta reta added the backport 2.x backport to 2.x branch label Nov 7, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-3666-to-2.x.

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 <[email protected]>
(cherry picked from commit 905c97d)
reta added a commit that referenced this pull request Nov 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants