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 and eclipse dependencies #589

Merged

Conversation

ryanbogan
Copy link
Member

@ryanbogan ryanbogan commented Feb 5, 2024

Description

Update spotless and eclipse dependencies to fix CVEs

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as 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.

@ryanbogan ryanbogan added backport 2.x Label will add auto workflow to backport PR to 2.x branch v2.12.0 Issues targeting release v2.12.0 labels Feb 5, 2024
@ryanbogan ryanbogan marked this pull request as ready for review February 5, 2024 20:07
Copy link

codecov bot commented Feb 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8bb1bac) 84.39% compared to head (335ca6e) 84.39%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main     #589   +/-   ##
=========================================
  Coverage     84.39%   84.39%           
  Complexity      535      535           
=========================================
  Files            40       40           
  Lines          1570     1570           
  Branches        245      245           
=========================================
  Hits           1325     1325           
  Misses          133      133           
  Partials        112      112           

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

@naveentatikonda naveentatikonda merged commit 8877db5 into opensearch-project:main Feb 5, 2024
54 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-589-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8877db5afa8b46d759fae8b778a6f66e07ef1b22
# Push it to GitHub
git push --set-upstream origin backport/backport-589-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-589-to-2.x.

@ryanbogan ryanbogan deleted the update_dependencies branch February 5, 2024 23:04
@ryanbogan
Copy link
Member Author

I'll raise manual backport

yuye-aws pushed a commit to yuye-aws/neural-search that referenced this pull request Mar 8, 2024
* Update spotless and eclipse dependencies

Signed-off-by: Ryan Bogan <[email protected]>

* Add changelog

Signed-off-by: Ryan Bogan <[email protected]>

* Add force resolution for eclipse resources

Signed-off-by: Ryan Bogan <[email protected]>

* Use latest resource version

Signed-off-by: Ryan Bogan <[email protected]>

---------

Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: yuye-aws <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Label will add auto workflow to backport PR to 2.x branch v2.12.0 Issues targeting release v2.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants