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

Update spotless to meet JDK-21 baseline #618

Merged
merged 1 commit into from
Feb 9, 2024

Conversation

reta
Copy link
Contributor

@reta reta commented Feb 6, 2024

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
Update spotless to meet JDK-21 baseline

Describe the solution you are proposing
A clear and concise description of what you want to happen.

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

Check List

  • Backport Labels added.
  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

@reta
Copy link
Contributor Author

reta commented Feb 6, 2024

@ansjcy purely formatting changes (spotless update)

Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bfab315) 69.40% compared to head (732f236) 69.32%.

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #618      +/-   ##
============================================
- Coverage     69.40%   69.32%   -0.08%     
+ Complexity      372      371       -1     
============================================
  Files            44       44              
  Lines          2706     2706              
  Branches        172      172              
============================================
- Hits           1878     1876       -2     
- Misses          725      727       +2     
  Partials        103      103              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -15,7 +15,6 @@ jobs:
java:
- 11
- 17
- 21
Copy link
Contributor Author

@reta reta Feb 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am dropping 21 from the GA for now, we need to fix tests (a lot apparently)

@reta reta force-pushed the update.spotless branch 2 times, most recently from a9c6f8e to a1165b4 Compare February 7, 2024 17:48
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta
Copy link
Contributor Author

reta commented Feb 8, 2024

@ansjcy @getsaurabh02 mind please taking a look folks? (last touches)

@ansjcy ansjcy merged commit 6c4400d into opensearch-project:main Feb 9, 2024
6 of 7 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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-618-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6c4400d573d8711ab3f71f603b9c54c4a207fa3c
# Push it to GitHub
git push --set-upstream origin backport/backport-618-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 base branch is 2.x and the compare/head branch is backport/backport-618-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

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

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.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-618-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6c4400d573d8711ab3f71f603b9c54c4a207fa3c
# Push it to GitHub
git push --set-upstream origin backport/backport-618-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-618-to-2.12.

reta added a commit to reta/performance-analyzer that referenced this pull request Feb 9, 2024
reta added a commit to reta/performance-analyzer that referenced this pull request Feb 9, 2024
(cherry picked from commit 6c4400d)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta added a commit to reta/performance-analyzer that referenced this pull request Feb 9, 2024
(cherry picked from commit 6c4400d)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
ansjcy pushed a commit that referenced this pull request Feb 9, 2024
(cherry picked from commit 6c4400d)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 9, 2024
(cherry picked from commit 6c4400d)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit f3acfe4)
ansjcy pushed a commit that referenced this pull request Feb 9, 2024
(cherry picked from commit 6c4400d)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit f3acfe4)

Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants