[Backport 2.x] Resolve CVE-2023-2976 by forcing use of Guava 32.0.1 (#2937)#2974
Merged
DarshitChanpura merged 1 commit intoopensearch-project:2.xfrom Jul 10, 2023
Conversation
DarshitChanpura
requested review from
RyanL1997,
cliu123,
cwperks,
davidlago,
peternied,
reta,
stephen-crawford and
willyborankin
as code owners
Signed-off-by: Stephen Crawford <steecraw@amazon.com> (cherry picked from commit 8ab7cb4) Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
DarshitChanpura
force-pushed
the
backport/backport-2937-to-2.x
branch
from
04e6434 to
c334172
Compare
DarshitChanpura
changed the title
stephen-crawford
approved these changes
Jul 10, 2023
Codecov Report
@@ Coverage Diff @@
## 2.x #2974 +/- ##
============================================
- Coverage 62.12% 62.05% -0.07%
+ Complexity 3373 3367 -6
============================================
Files 264 264
Lines 19442 19442
Branches 3314 3314
============================================
- Hits 12078 12065 -13
- Misses 5769 5776 +7
- Partials 1595 1601 +6 |
reta
reviewed
Jul 10, 2023
| force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4 | ||
| force "com.github.luben:zstd-jni:${versions.zstd}" | ||
| force "org.xerial.snappy:snappy-java:1.1.10.1" | ||
| force 'com.google.guava:guava:32.0.1-jre' |
Collaborator
There was a problem hiding this comment.
The 32.1.1-jre was out already, should we bump it here (and on main)?
Member
Author
There was a problem hiding this comment.
I will create a separate PR and backports for that bump. Merging this for now to unblock CI.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Backports #2937
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.