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

bump guava version for cve #1559

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Conversation

derek-ho
Copy link
Collaborator

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

@codecov
Copy link

codecov bot commented Jun 27, 2023

Codecov Report

Merging #1559 (cccb16f) into 1.3 (953ddff) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                1.3    #1559   +/-   ##
=========================================
  Coverage     76.55%   76.55%           
  Complexity      283      283           
=========================================
  Files            38       38           
  Lines          2158     2158           
  Branches        228      228           
=========================================
  Hits           1652     1652           
  Misses          365      365           
  Partials        141      141           
Flag Coverage Δ
opensearch-observability 76.55% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@derek-ho derek-ho merged commit cf3e952 into opensearch-project:1.3 Jun 27, 2023
@derek-ho derek-ho deleted the bump-guava branch June 27, 2023 17:31
@opensearch-trigger-bot
Copy link
Contributor

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants