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

Upgrade Guava dependency #6396

Merged
merged 5 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Introduce TransactionEvaluationContext to pass data between transaction selectors and plugin, during block creation [#6381](https://github.com/hyperledger/besu/pull/6381)
- Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377)
- Upgrade `com.fasterxml.jackson` dependencies [#6378](https://github.com/hyperledger/besu/pull/6378)
- Upgrade Guava dependency [#6396](https://github.com/hyperledger/besu/pull/6396)

### Bug fixes
- INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class PendingTransactionEstimatedMemorySizeTest extends BaseTransactionPo
private static final Set<Class<?>> SHARED_CLASSES =
Set.of(SignatureAlgorithm.class, TransactionType.class);
private static final Set<String> COMMON_CONSTANT_FIELD_PATHS =
Set.of(".value.ctor", ".hashNoSignature");
Set.of(".value.ctor", ".hashNoSignature", ".signature.encoded.delegate");
private static final Set<String> EIP1559_EIP4844_CONSTANT_FIELD_PATHS =
Sets.union(COMMON_CONSTANT_FIELD_PATHS, Set.of(".gasPrice"));
private static final Set<String> FRONTIER_ACCESS_LIST_CONSTANT_FIELD_PATHS =
Expand Down
96 changes: 44 additions & 52 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -760,14 +760,6 @@
<sha256 value="53a3d53b014e33fd773bba6ae510343bcc1d11dabcaf1ae16c77f327b192c026" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.11.0">
<artifact name="error_prone_annotations-2.11.0.jar">
<sha256 value="721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" origin="Generated by Gradle"/>
</artifact>
<artifact name="error_prone_annotations-2.11.0.pom">
<sha256 value="0261ca01f2d2e9ac2ae2ece75d42c56323b385fb294b6bc943f62ef4e92ddf08" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
<artifact name="error_prone_annotations-2.18.0.jar">
<sha256 value="9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae" origin="Generated by Gradle"/>
Expand All @@ -777,9 +769,6 @@
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.20.0">
<artifact name="error_prone_annotations-2.20.0.jar">
<sha256 value="a136d3dce67168d88751115fa223bec80eae6cc062aa2f8173e8344a98235ec4" origin="Generated by Gradle"/>
</artifact>
<artifact name="error_prone_annotations-2.20.0.pom">
<sha256 value="94f50653af659be1d1a0d785f97cba768571f794d2e655fc3d22e4eee6512b39" origin="Generated by Gradle"/>
</artifact>
Expand All @@ -792,6 +781,14 @@
<sha256 value="f598880feefaea9d674dc41db13ab37004bf03776b5bb21c04dede8e920c1f12" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.23.0">
<artifact name="error_prone_annotations-2.23.0.jar">
<sha256 value="ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054" origin="Generated by Gradle"/>
</artifact>
<artifact name="error_prone_annotations-2.23.0.pom">
<sha256 value="d5abb17f231b63bf009358fa640281b744810cb9587e5994977834959c07dbd8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_check_api" version="2.18.0">
<artifact name="error_prone_check_api-2.18.0.jar">
<sha256 value="6c34578691c4fae9bced50b2a3fe8b4e0420469fb0770655a3ea41ed2a9e40a4" origin="Generated by Gradle"/>
Expand All @@ -808,11 +805,6 @@
<sha256 value="d6c9b956d12e9134ed7e01e82b715c5fd2d6318c3cf803519edef27f6486b9c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_parent" version="2.11.0">
<artifact name="error_prone_parent-2.11.0.pom">
<sha256 value="8283f0cb44c624a79d330b6fd80b8b8a715a68b3685c9a951c3de837d4540551" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_parent" version="2.18.0">
<artifact name="error_prone_parent-2.18.0.pom">
<sha256 value="47f22e99c7bf466391def16f8377985e5d3ba6f5bbcf65853644805513e15fad" origin="Generated by Gradle"/>
Expand All @@ -828,6 +820,11 @@
<sha256 value="32bb0b5ff241fd6ba1feea448aebb9cedef1699be73cb6f319365387b82bf92c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_parent" version="2.23.0">
<artifact name="error_prone_parent-2.23.0.pom">
<sha256 value="f5470a4b3104fe309fbe94a80d16c3c54d20f748f4c5de4f68a428688f30cbd4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_test_helpers" version="2.18.0">
<artifact name="error_prone_test_helpers-2.18.0.jar">
<sha256 value="595b2921ec2e826e4ce62e84cdcdbb185ee0fa829ab734cf01fedca205601806" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -920,12 +917,12 @@
<sha256 value="e96042ce78fecba0da2be964522947c87b40a291b5fd3cd672a434924103c4b9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava" version="31.1-jre">
<artifact name="guava-31.1-jre.jar">
<sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
<component group="com.google.guava" name="failureaccess" version="1.0.2">
<artifact name="failureaccess-1.0.2.jar">
<sha256 value="8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064" origin="Generated by Gradle"/>
</artifact>
<artifact name="guava-31.1-jre.pom">
<sha256 value="9193d07bf4f660108d7358e58b27d21b44e34e80d6734e98e21916376f270de2" origin="Generated by Gradle"/>
<artifact name="failureaccess-1.0.2.pom">
<sha256 value="19ebc6f4bdb4edbb3d07b6ee994f846b54ef295582a9b5634719ffa9f31d03b2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava" version="32.0.1-jre">
Expand All @@ -944,16 +941,22 @@
<sha256 value="f5fff7642c12e7627bc14289fd267e2602c17f9590e23522c3e63107f61c2942" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava" version="33.0.0-jre">
<artifact name="guava-33.0.0-jre.jar">
<sha256 value="f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537" origin="Generated by Gradle"/>
</artifact>
<artifact name="guava-33.0.0-jre.module">
<sha256 value="59a2dbd055d1baa762e78f1a5ba3ab973edd13fc27dcc1871105e2f797f682d3" origin="Generated by Gradle"/>
</artifact>
<artifact name="guava-33.0.0-jre.pom">
<sha256 value="fd70b14c441986c22e6d22ced2576787756be4918b145a8abd223e3a80b6e32d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava-parent" version="26.0-android">
<artifact name="guava-parent-26.0-android.pom">
<sha256 value="f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava-parent" version="31.1-jre">
<artifact name="guava-parent-31.1-jre.pom">
<sha256 value="4439626783b44ad25ef05ff07621dd4bb796cc4eb4f2966a4a461fea4130e0fc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava-parent" version="32.0.1-jre">
<artifact name="guava-parent-32.0.1-jre.pom">
<sha256 value="43ed0e36b353f41e5eb75cd756667c9e2df97cef06eb16066967158a1d034d2a" origin="Generated by Gradle"/>
Expand All @@ -964,6 +967,11 @@
<sha256 value="f283c1f04897a9a88a3fa4ff46804e65e82114809a09cd04094bf7de01b1857b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="guava-parent" version="33.0.0-jre">
<artifact name="guava-parent-33.0.0-jre.pom">
<sha256 value="040cc88c680b413d70ba9fc8371b36093021b10996aa3598621de767d418229a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.guava" name="listenablefuture" version="9999.0-empty-to-avoid-conflict-with-guava">
<artifact name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar">
<sha256 value="b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -998,14 +1006,6 @@
<sha256 value="a7658d2e370299f2ea5f3dcfb75fedfcc9b9fa7251c387ecce95e9d32df48b71" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.j2objc" name="j2objc-annotations" version="1.3">
<artifact name="j2objc-annotations-1.3.jar">
<sha256 value="21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b" origin="Generated by Gradle"/>
</artifact>
<artifact name="j2objc-annotations-1.3.pom">
<sha256 value="5faca824ba115bee458730337dfdb2fcea46ba2fd774d4304edbf30fa6a3f055" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.j2objc" name="j2objc-annotations" version="2.8">
<artifact name="j2objc-annotations-2.8.jar">
<sha256 value="f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -3492,22 +3492,6 @@
<sha256 value="42f21ebd9183be049ee5afc822b345403a5da764037875734a039b0d6e0353be" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.checkerframework" name="checker-qual" version="3.12.0">
<artifact name="checker-qual-3.12.0.jar">
<sha256 value="ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb" origin="Generated by Gradle"/>
</artifact>
<artifact name="checker-qual-3.12.0.module">
<sha256 value="d047949c1b81091c2c3913771fac2f32a2fa549ba3d5d548cc8c0b6dfa493777" origin="Generated by Gradle"/>
</artifact>
<artifact name="checker-qual-3.12.0.pom">
<sha256 value="775b7ae36e62820b3b86dc1aa39af37c0ac4b85ff48f7fe485a922a2790f46b9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.checkerframework" name="checker-qual" version="3.13.0">
<artifact name="checker-qual-3.13.0.module">
<sha256 value="19c5c98bf51711bcdbbd6f34d58fe552bfc60f5ca7888baa74eca1b1f7c4c6dc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.checkerframework" name="checker-qual" version="3.33.0">
<artifact name="checker-qual-3.33.0.jar">
<sha256 value="e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1" origin="Generated by Gradle"/>
Expand All @@ -3523,8 +3507,16 @@
<artifact name="checker-qual-3.37.0.module">
<sha256 value="7258a769dcaa26b98154d229d85cc72e5b3666b0bcb637d2daf16ec498956638" origin="Generated by Gradle"/>
</artifact>
<artifact name="checker-qual-3.37.0.pom">
<sha256 value="02392fbd4ce21901f945615472b1d4d4d3591b3aabdf013105f5c92ec32cb4f0" origin="Generated by Gradle"/>
</component>
<component group="org.checkerframework" name="checker-qual" version="3.41.0">
<artifact name="checker-qual-3.41.0.jar">
<sha256 value="2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172" origin="Generated by Gradle"/>
</artifact>
<artifact name="checker-qual-3.41.0.module">
<sha256 value="b38672c17f455276b210ed3402ff92dce666770b1a8c610c7cc34ad54c532d20" origin="Generated by Gradle"/>
</artifact>
<artifact name="checker-qual-3.41.0.pom">
<sha256 value="5c73b0770540842cf06a01d264bbb89ae5e248669dc9da80e861e8233dd4675b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.checkerframework" name="dataflow-errorprone" version="3.27.0">
Expand Down
2 changes: 1 addition & 1 deletion gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencyManagement {
entry 'error_prone_test_helpers'
}

dependency 'com.google.guava:guava:31.1-jre'
dependency 'com.google.guava:guava:33.0.0-jre'

dependency 'com.graphql-java:graphql-java:21.3'

Expand Down
Loading