Updates Guava versions to address CVE #292
Merged
Conversation
This file contains 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
Updates direct Guava dependency to 30.0. Also, updates check style to 8.29 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
jmazanec15
added
backport 1.x
security fix
VijayanB
previously approved these changes
Feb 16, 2022
vamshin
reviewed
Feb 16, 2022
Comment on lines
-244
to
-248
| <property name="allowMissingThrowsTags" value="true"/> | ||
| <property name="allowMissingReturnTag" value="true"/> | ||
| <property name="minLineCount" value="2"/> | ||
| <property name="allowedAnnotations" value="Override, Test"/> | ||
| <property name="allowThrowsTagsForSubclasses" value="true"/> |
There was a problem hiding this comment.
why are these properties removed?
There was a problem hiding this comment.
They break checkstyle upgrade.
There was a problem hiding this comment.
just to make sure - are we making our requirements stricter by removing those rules?
There was a problem hiding this comment.
Yes, it will be stricter. I think it is okay because, currently, we do not enforce the checkstyle checks.
In the future, we should migrate to spotless, as this is what OpenSearch does: opensearch-project/OpenSearch#1370. I will create an issue for this.
junqiu-lei
previously approved these changes
Feb 16, 2022
Signed-off-by: John Mazanec <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #292 +/- ##
=========================================
Coverage 83.38% 83.38%
Complexity 885 885
=========================================
Files 127 127
Lines 3834 3834
Branches 361 361
=========================================
Hits 3197 3197
Misses 475 475
Partials 162 162 Continue to review full report at Codecov.
|
martin-gaievski
approved these changes
Feb 16, 2022
Shivamdhar
approved these changes
Feb 16, 2022
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Feb 16, 2022
Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]> (cherry picked from commit e77ef78)
|
The backport to 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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-292-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e77ef78775ab6414d67dd240de9d01b85c0373b8
# Push it to GitHub
git push --set-upstream origin backport/backport-292-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.xThen, create a pull request where the |
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Feb 16, 2022
Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]> (cherry picked from commit e77ef78)
jmazanec15
added a commit
that referenced
this pull request
Feb 16, 2022
Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
jmazanec15
pushed a commit
that referenced
this pull request
Feb 16, 2022
Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
martin-gaievski
pushed a commit
to martin-gaievski/k-NN
that referenced
this pull request
Mar 7, 2022
…earch-project#295) Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
martin-gaievski
pushed a commit
to martin-gaievski/k-NN
that referenced
this pull request
Mar 7, 2022
…earch-project#295) Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]> Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski
pushed a commit
to martin-gaievski/k-NN
that referenced
this pull request
Mar 30, 2022
Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
martin-gaievski
pushed a commit
to martin-gaievski/k-NN
that referenced
this pull request
Mar 31, 2022
…earch-project#295) Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Upgrades guava dependency as well as checkstyle dependency (which has a guava dependency as well) to address CVE.
Issues Resolved
#283 #282
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.