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 Guava to 31.1 #9707

Merged
merged 5 commits into from
Mar 30, 2022
Merged

Update Guava to 31.1 #9707

merged 5 commits into from
Mar 30, 2022

Conversation

elharo
Copy link
Contributor

@elharo elharo commented Mar 30, 2022

@acozzette this time with properly pinned dependencies

@elharo
Copy link
Contributor Author

elharo commented Mar 30, 2022

Not sure what's up with Kokoro. Can someone take a look? In any case, please don't merge until all Kokoro tests have been verified to pass.

@acozzette
Copy link
Member

I think I have an internal fix for the Kokoro problem and it's just waiting on a review before I can submit it.

@acozzette acozzette merged commit 61dcf50 into protocolbuffers:main Mar 30, 2022
@elharo elharo deleted the guavan branch March 30, 2022 20:55
copybara-service bot pushed a commit that referenced this pull request Jun 8, 2023
Updates Guava to [32.0.0](https://github.com/google/guava/releases/tag/v32.0.0) to include fixes for CVE-2020-8908 and CVE-2023-2976 (google/guava#2575) which affects certain builds with shaded usage, e.g ruby via jruby/java platform such as https://rubygems.org/gems/google-protobuf/versions/3.23.2-java

- Protobuf does not appear to (directly) use the affected `Files.createTempDir` or `FileBackedOutputStream` code which might behave differently on Windows.
- Referred to #9707 and #9757 for reference
- Updated transitive dependency versions match https://mvnrepository.com/artifact/com.google.guava/guava/32.0.0-jre (note major version change for `j2objc-annotations` from `1.3` --> `2.8`)

May need backporting to `23.x` branch if sufficiently compatible.

Closes #12953

COPYBARA_INTEGRATE_REVIEW=#12953 from chadlwilson:update-guava-32 9c396b6
PiperOrigin-RevId: 538666552
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants