Update dependencies (hyperledger#7571)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
daniellehrner · Sep 5, 2024 · edd3c4f · edd3c4f
1 parent 7f0982d
commit edd3c4f
Show file tree

Hide file tree

Showing 7 changed files with 1,771 additions and 1,590 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Additions and Improvements
+- Update Java and Gradle dependecies [#7571](https://github.com/hyperledger/besu/pull/7571)
 
 ### Bug fixes
 - Layered txpool: do not send notifications when moving tx between layers [#7539](https://github.com/hyperledger/besu/pull/7539)

diff --git a/build.gradle b/build.gradle
@@ -25,13 +25,13 @@ import java.util.regex.Pattern
 plugins {
  id 'com.diffplug.spotless' version '6.25.0'
  id 'com.github.ben-manes.versions' version '0.51.0'
- id 'com.github.jk1.dependency-license-report' version '2.7'
- id 'com.jfrog.artifactory' version '5.2.0'
- id 'io.spring.dependency-management' version '1.1.5'
+ id 'com.github.jk1.dependency-license-report' version '2.9'
+ id 'com.jfrog.artifactory' version '5.2.5'
+ id 'io.spring.dependency-management' version '1.1.6'
  id 'me.champeau.jmh' version '0.7.2' apply false
- id 'net.ltgt.errorprone' version '3.1.0'
+ id 'net.ltgt.errorprone' version '4.0.1'
  id 'maven-publish'
- id 'org.sonarqube' version '4.4.1.3373'
+ id 'org.sonarqube' version '5.1.0.4882'
 }
 
 sonarqube {

diff --git a/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java b/...r/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java
@@ -236,7 +236,12 @@ private void assertAccessListExpectedResult(
  new JsonRpcSuccessResponse(null, new CreateAccessListResult(accessList, gasUsed));
 
  final JsonRpcResponse response = method.response(request);
- assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+ assertThat(response)
+ .usingRecursiveComparison()
+ // customize the comparison for the type that lazy compute the hashCode
+ .withEqualsForType(UInt256::equals, UInt256.class)
+ .withEqualsForType(Address::equals, Address.class)
+ .isEqualTo(expectedResponse);
  }
 
  private JsonRpcRequestContext requestWithParams(final Object... params) {

diff --git a/.../eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java b/.../eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java
@@ -31,8 +31,8 @@
 public abstract class PendingTransaction
  implements org.hyperledger.besu.datatypes.PendingTransaction {
  static final int NOT_INITIALIZED = -1;
- static final int FRONTIER_AND_ACCESS_LIST_SHALLOW_MEMORY_SIZE = 888;
- static final int EIP1559_AND_EIP4844_SHALLOW_MEMORY_SIZE = 1000;
+ static final int FRONTIER_AND_ACCESS_LIST_SHALLOW_MEMORY_SIZE = 904;
+ static final int EIP1559_AND_EIP4844_SHALLOW_MEMORY_SIZE = 1016;
  static final int OPTIONAL_TO_MEMORY_SIZE = 112;
  static final int OPTIONAL_CHAIN_ID_MEMORY_SIZE = 80;
  static final int PAYLOAD_BASE_MEMORY_SIZE = 32;

diff --git a/gradle/license-normalizer-bundle.json b/gradle/license-normalizer-bundle.json
@@ -57,6 +57,7 @@
  { "bundleName" : "CC0-1.0", "licenseUrlPattern" : ".*(www\\.)?creativecommons\\.org/publicdomain/zero/1\\.0/" },
  { "bundleName" : "CDDL-1.0", "licenseFileContentPattern" : ".*CDDL.*1\\.0" },
  { "bundleName" : "CDDL-1.0", "licenseUrlPattern" : ".*CDDL.*.?1\\.0" },
+ { "bundleName" : "CDDL-1.0", "licenseNamePattern" : "CDDL-1\\.0" },
  { "bundleName" : "CDDL-1.1", "licenseUrlPattern" : ".*CDDL.*.?1\\.1" },
  { "bundleName" : "CDDL-1.0", "licenseNamePattern" : "Common Development and Distribution License( \\(CDDL\\),?)? (version )?(.?\\s?)?1\\.0" },
  { "bundleName" : "CDDL-1.1", "licenseNamePattern" : "Common Development and Distribution License( \\(CDDL\\),?)? (version )?(.?\\s?)?1\\.1" },
@@ -68,7 +69,7 @@
  { "bundleName" : "BSD-2-Clause", "licenseUrlPattern" : ".*(www\\.)?opensource\\.org/licenses/BSD-2-Clause" },
  { "bundleName" : "BSD-2-Clause", "licenseUrlPattern" : ".*(www\\.)?opensource\\.org/licenses/bsd-license(\\.php)?" },
  { "bundleName" : "CDDL-1.0", "licenseNamePattern" : "Common Development and Distribution( License)?" },
- { "bundleName" : "CDDL-1.0", "licenseNamePattern" : "CDDL 1(\\.0)" },
+ { "bundleName" : "CDDL-1.0", "licenseNamePattern" : "CDDL( |-)1(\\.0)" },
  { "bundleName" : "CDDL-1.1", "licenseNamePattern" : "CDDL 1\\.1" },
  { "bundleName" : "CDDL-1.1", "licenseUrlPattern" : ".*(www\\.).opensource\\.org/licenses/CDDL-1\\.0" },
  { "bundleName" : "EPL-1.0", "licenseNamePattern" : "Eclipse Publish License.*(v|version)\\.?\\s?1(\\.?0)?" },