CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies (#7571)

Browse Source 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
pull/7586/head
Fabio Di Fabio 3 months ago committed by GitHub
parent 7f0982d228
commit edd3c4f0a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 1771 additions and 1590 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 10
      build.gradle
  3. 7
      ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java
  4. 4
      ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java
  5. 3
      gradle/license-normalizer-bundle.json
  6. 3221
      gradle/verification-metadata.xml
  7. 115
      gradle/versions.gradle

1
CHANGELOG.md
Unescape View File

@ -7,6 +7,7 @@
### Breaking Changes ### Breaking Changes
### Additions and Improvements ### Additions and Improvements
- Update Java and Gradle dependecies [#7571](https://github.com/hyperledger/besu/pull/7571)
### Bug fixes ### Bug fixes
- Layered txpool: do not send notifications when moving tx between layers [#7539](https://github.com/hyperledger/besu/pull/7539) - Layered txpool: do not send notifications when moving tx between layers [#7539](https://github.com/hyperledger/besu/pull/7539)

10
build.gradle
Unescape View File

@ -25,13 +25,13 @@ import java.util.regex.Pattern
plugins { plugins {
id 'com.diffplug.spotless' version '6.25.0' id 'com.diffplug.spotless' version '6.25.0'
id 'com.github.ben-manes.versions' version '0.51.0' id 'com.github.ben-manes.versions' version '0.51.0'
id 'com.github.jk1.dependency-license-report' version '2.7' id 'com.github.jk1.dependency-license-report' version '2.9'
id 'com.jfrog.artifactory' version '5.2.0' id 'com.jfrog.artifactory' version '5.2.5'
id 'io.spring.dependency-management' version '1.1.5' id 'io.spring.dependency-management' version '1.1.6'
id 'me.champeau.jmh' version '0.7.2' apply false 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 'maven-publish'
id 'org.sonarqube' version '4.4.1.3373' id 'org.sonarqube' version '5.1.0.4882'
} }
sonarqube { sonarqube {

7
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java
Unescape View File

@ -236,7 +236,12 @@ public class EthCreateAccessListIntegrationTest {
new JsonRpcSuccessResponse(null, new CreateAccessListResult(accessList, gasUsed)); new JsonRpcSuccessResponse(null, new CreateAccessListResult(accessList, gasUsed));
final JsonRpcResponse response = method.response(request); 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) { private JsonRpcRequestContext requestWithParams(final Object... params) {

4
ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java
Unescape View File

@ -31,8 +31,8 @@ import java.util.concurrent.atomic.AtomicLong;
public abstract class PendingTransaction public abstract class PendingTransaction
implements org.hyperledger.besu.datatypes.PendingTransaction { implements org.hyperledger.besu.datatypes.PendingTransaction {
static final int NOT_INITIALIZED = -1; static final int NOT_INITIALIZED = -1;
static final int FRONTIER_AND_ACCESS_LIST_SHALLOW_MEMORY_SIZE = 888; static final int FRONTIER_AND_ACCESS_LIST_SHALLOW_MEMORY_SIZE = 904;
static final int EIP1559_AND_EIP4844_SHALLOW_MEMORY_SIZE = 1000; static final int EIP1559_AND_EIP4844_SHALLOW_MEMORY_SIZE = 1016;
static final int OPTIONAL_TO_MEMORY_SIZE = 112; static final int OPTIONAL_TO_MEMORY_SIZE = 112;
static final int OPTIONAL_CHAIN_ID_MEMORY_SIZE = 80; static final int OPTIONAL_CHAIN_ID_MEMORY_SIZE = 80;
static final int PAYLOAD_BASE_MEMORY_SIZE = 32; static final int PAYLOAD_BASE_MEMORY_SIZE = 32;

3
gradle/license-normalizer-bundle.json
Unescape View File

@ -57,6 +57,7 @@
{ "bundleName" : "CC0-1.0", "licenseUrlPattern" : ".*(www\\.)?creativecommons\\.org/publicdomain/zero/1\\.0/" }, { "bundleName" : "CC0-1.0", "licenseUrlPattern" : ".*(www\\.)?creativecommons\\.org/publicdomain/zero/1\\.0/" },
{ "bundleName" : "CDDL-1.0", "licenseFileContentPattern" : ".*CDDL.*1\\.0" }, { "bundleName" : "CDDL-1.0", "licenseFileContentPattern" : ".*CDDL.*1\\.0" },
{ "bundleName" : "CDDL-1.0", "licenseUrlPattern" : ".*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.1", "licenseUrlPattern" : ".*CDDL.*.?1\\.1" },
{ "bundleName" : "CDDL-1.0", "licenseNamePattern" : "Common Development and Distribution License( \\(CDDL\\),?)? (version )?(.?\\s?)?1\\.0" }, { "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" }, { "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-2-Clause" },
{ "bundleName" : "BSD-2-Clause", "licenseUrlPattern" : ".*(www\\.)?opensource\\.org/licenses/bsd-license(\\.php)?" }, { "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" : "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", "licenseNamePattern" : "CDDL 1\\.1" },
{ "bundleName" : "CDDL-1.1", "licenseUrlPattern" : ".*(www\\.).opensource\\.org/licenses/CDDL-1\\.0" }, { "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)?" }, { "bundleName" : "EPL-1.0", "licenseNamePattern" : "Eclipse Publish License.*(v|version)\\.?\\s?1(\\.?0)?" },

3221
gradle/verification-metadata.xml
View File

File diff suppressed because it is too large Load Diff

115
gradle/versions.gradle
Unescape View File

@ -17,12 +17,7 @@ dependencyManagement {
dependencies { dependencies {
applyMavenExclusions = false applyMavenExclusions = false
dependencySet(group: 'org.antlr', version: '4.11.1') { dependencySet(group:'com.fasterxml.jackson.core', version:'2.17.2') {
entry 'antlr4'
entry 'antlr4-runtime'
}
dependencySet(group:'com.fasterxml.jackson.core', version:'2.16.1') {
entry 'jackson-databind' entry 'jackson-databind'
entry 'jackson-datatype' entry 'jackson-datatype'
entry 'jackson-datatype-jdk8' entry 'jackson-datatype-jdk8'
@ -30,20 +25,20 @@ dependencyManagement {
dependency 'com.github.ben-manes.caffeine:caffeine:3.1.8' dependency 'com.github.ben-manes.caffeine:caffeine:3.1.8'
dependency 'com.github.oshi:oshi-core:6.4.10' dependency 'com.github.oshi:oshi-core:6.6.3'
dependency 'com.google.auto.service:auto-service:1.1.1' dependency 'com.google.auto.service:auto-service:1.1.1'
dependencySet(group: 'com.google.dagger', version: '2.50') { dependencySet(group: 'com.google.dagger', version: '2.52') {
entry'dagger-compiler' entry'dagger-compiler'
entry'dagger' entry'dagger'
} }
dependency 'org.hyperledger.besu:besu-errorprone-checks:1.0.0' dependency 'org.hyperledger.besu:besu-errorprone-checks:1.0.0'
dependency 'com.google.guava:guava:33.0.0-jre' dependency 'com.google.guava:guava:33.3.0-jre'
dependency 'com.graphql-java:graphql-java:21.5' dependency 'com.graphql-java:graphql-java:22.2'
dependency 'com.splunk.logging:splunk-library-javalogging:1.11.8' dependency 'com.splunk.logging:splunk-library-javalogging:1.11.8'
@ -51,16 +46,18 @@ dependencyManagement {
dependency 'commons-codec:commons-codec:1.16.0' dependency 'commons-codec:commons-codec:1.16.0'
dependency 'commons-io:commons-io:2.15.1' dependency 'commons-io:commons-io:2.16.1'
dependency 'commons-net:commons-net:3.11.1'
dependency 'dnsjava:dnsjava:3.6.0' dependency 'dnsjava:dnsjava:3.6.1'
dependencySet(group: 'info.picocli', version: '4.7.5') { dependencySet(group: 'info.picocli', version: '4.7.6') {
entry 'picocli' entry 'picocli'
entry 'picocli-codegen' entry 'picocli-codegen'
} }
dependencySet(group: 'io.grpc', version: '1.60.1') { dependencySet(group: 'io.grpc', version: '1.66.0') {
entry 'grpc-all' entry 'grpc-all'
entry 'grpc-core' entry 'grpc-core'
entry 'grpc-netty' entry 'grpc-netty'
@ -69,22 +66,22 @@ dependencyManagement {
dependency 'io.kubernetes:client-java:18.0.1' dependency 'io.kubernetes:client-java:18.0.1'
dependency 'io.netty:netty-all:4.1.110.Final' dependency 'io.netty:netty-all:4.1.112.Final'
dependency 'io.netty:netty-tcnative-boringssl-static:2.0.62.Final' dependency 'io.netty:netty-tcnative-boringssl-static:2.0.66.Final'
dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.110.Final', classifier: 'linux-x86_64' dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.112.Final', classifier: 'linux-x86_64'
dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.110.Final', classifier: 'osx-x86_64' dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.112.Final', classifier: 'osx-x86_64'
dependency 'io.netty:netty-transport-native-unix-common:4.1.110.Final' dependency 'io.netty:netty-transport-native-unix-common:4.1.112.Final'
dependency 'io.opentelemetry:opentelemetry-api:1.33.0' dependency 'io.opentelemetry:opentelemetry-api:1.41.0'
dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.33.0' dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.41.0'
dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.33.0' dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.41.0'
dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.33.0' dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.41.0'
dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.33.0' dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.41.0'
dependency 'io.opentelemetry:opentelemetry-sdk:1.33.0' dependency 'io.opentelemetry:opentelemetry-sdk:1.41.0'
dependency 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.33.0' dependency 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.41.0'
dependency 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.32.0-alpha' dependency 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:2.7.0-alpha'
dependency 'io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha' dependency 'io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha'
dependency 'io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha' dependency 'io.opentelemetry.semconv:opentelemetry-semconv:1.27.0-alpha'
dependency 'io.opentracing.contrib:opentracing-okhttp3:3.0.0' dependency 'io.opentracing.contrib:opentracing-okhttp3:3.0.0'
dependency 'io.opentracing:opentracing-api:0.33.0' dependency 'io.opentracing:opentracing-api:0.33.0'
@ -115,7 +112,7 @@ dependencyManagement {
entry 'tuweni-units' entry 'tuweni-units'
} }
dependencySet(group: 'io.vertx', version: '4.5.8') { dependencySet(group: 'io.vertx', version: '4.5.9') {
entry 'vertx-auth-jwt' entry 'vertx-auth-jwt'
entry 'vertx-codegen' entry 'vertx-codegen'
entry 'vertx-core' entry 'vertx-core'
@ -130,24 +127,28 @@ dependencyManagement {
dependency 'net.java.dev.jna:jna:5.14.0' dependency 'net.java.dev.jna:jna:5.14.0'
dependency 'org.apache.commons:commons-compress:1.26.0' dependencySet(group: 'org.antlr', version: '4.11.1') {
dependency 'org.apache.commons:commons-lang3:3.14.0' entry 'antlr4'
dependency 'org.apache.commons:commons-text:1.11.0' entry 'antlr4-runtime'
}
dependency 'org.apache.commons:commons-collections4:4.4' dependency 'org.apache.commons:commons-collections4:4.4'
dependency 'commons-net:commons-net:3.11.0' dependency 'org.apache.commons:commons-compress:1.27.1'
dependency 'org.apache.commons:commons-lang3:3.17.0'
dependency 'org.apache.commons:commons-text:1.12.0'
dependencySet(group: 'org.apache.logging.log4j', version: '2.22.1') { dependencySet(group: 'org.apache.logging.log4j', version: '2.23.1') {
entry 'log4j-api' entry 'log4j-api'
entry 'log4j-core' entry 'log4j-core'
entry 'log4j-jul' entry 'log4j-jul'
entry 'log4j-slf4j2-impl' entry 'log4j-slf4j2-impl'
} }
dependency 'org.assertj:assertj-core:3.25.1' dependency 'org.assertj:assertj-core:3.26.3'
dependency 'org.awaitility:awaitility:4.2.0' dependency 'org.awaitility:awaitility:4.2.2'
dependencySet(group: 'org.bouncycastle', version: '1.77') { dependencySet(group: 'org.bouncycastle', version: '1.78.1') {
entry'bcpkix-jdk18on' entry'bcpkix-jdk18on'
entry'bcprov-jdk18on' entry'bcprov-jdk18on'
} }
@ -164,19 +165,21 @@ dependencyManagement {
entry 'gnark' entry 'gnark'
} }
dependencySet(group: 'org.immutables', version: '2.10.0') { dependencySet(group: 'org.immutables', version: '2.10.1') {
entry 'value-annotations' entry 'value-annotations'
entry 'value' entry 'value'
} }
dependency 'org.java-websocket:Java-WebSocket:1.5.5' dependency 'org.java-websocket:Java-WebSocket:1.5.7'
dependency 'org.jacoco:org.jacoco.agent:0.8.11' dependencySet(group: 'org.jacoco', version: '0.8.12') {
dependency 'org.jacoco:org.jacoco.core:0.8.11' entry 'org.jacoco.agent'
entry 'org.jacoco.core'
}
dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22' dependency 'org.jetbrains.kotlin:kotlin-stdlib:2.0.20'
dependencySet(group: 'org.junit.jupiter', version: '5.10.1') { dependencySet(group: 'org.junit.jupiter', version: '5.11.0') {
entry 'junit-jupiter' entry 'junit-jupiter'
entry 'junit-jupiter-api' entry 'junit-jupiter-api'
entry 'junit-jupiter-engine' entry 'junit-jupiter-engine'
@ -189,47 +192,47 @@ dependencyManagement {
dependency 'org.junit.vintage:junit-vintage-engine:5.10.1' dependency 'org.junit.vintage:junit-vintage-engine:5.10.1'
dependencySet(group: 'org.jupnp', version:'2.7.1') { dependencySet(group: 'org.jupnp', version:'3.0.2') {
entry 'org.jupnp.support' entry 'org.jupnp.support'
entry 'org.jupnp' entry 'org.jupnp'
} }
dependencySet(group: 'org.mockito', version:'5.8.0') { dependencySet(group: 'org.mockito', version:'5.13.0') {
entry 'mockito-core' entry 'mockito-core'
entry 'mockito-junit-jupiter' entry 'mockito-junit-jupiter'
} }
dependencySet(group: 'org.openjdk.jmh', version:'1.36') { dependencySet(group: 'org.openjdk.jmh', version:'1.37') {
entry 'jmh-core' entry 'jmh-core'
entry 'jmh-generator-annprocess' entry 'jmh-generator-annprocess'
} }
dependency 'org.owasp.encoder:encoder:1.2.3' dependency 'org.owasp.encoder:encoder:1.3.1'
dependency 'org.rocksdb:rocksdbjni:8.3.2' // 8.9.1 causes a bug with a FOREST canary dependency 'org.rocksdb:rocksdbjni:8.3.2' // 8.9.1 causes a bug with a FOREST canary
dependencySet(group: 'org.slf4j', version:'2.0.10') { dependencySet(group: 'org.slf4j', version:'2.0.16') {
entry 'slf4j-api' entry 'slf4j-api'
entry 'slf4j-nop' entry 'slf4j-nop'
} }
dependency 'org.springframework.security:spring-security-crypto:6.2.1' dependency 'org.springframework.security:spring-security-crypto:6.3.3'
dependency 'org.testcontainers:testcontainers:1.19.3' dependency 'org.testcontainers:testcontainers:1.20.1'
dependency 'org.web3j:quorum:4.10.0' dependency 'org.web3j:quorum:4.10.0'
dependencySet(group: 'org.web3j', version: '4.11.1') { dependencySet(group: 'org.web3j', version: '4.12.1') {
entry 'abi' entry 'abi'
entry 'besu' entry 'besu'
entry 'core' entry 'core'
entry 'crypto' entry 'crypto'
} }
dependencySet(group: 'org.wiremock', version: '3.3.1') { dependencySet(group: 'org.wiremock', version: '3.9.1') {
entry 'wiremock' entry 'wiremock'
} }
dependency 'org.xerial.snappy:snappy-java:1.1.10.5' dependency 'org.xerial.snappy:snappy-java:1.1.10.6'
dependency 'org.yaml:snakeyaml:2.0' dependency 'org.yaml:snakeyaml:2.0'
@ -237,6 +240,6 @@ dependencyManagement {
dependency 'tech.pegasys:jc-kzg-4844:1.0.0' dependency 'tech.pegasys:jc-kzg-4844:1.0.0'
dependency 'tech.pegasys.discovery:discovery:22.12.0' dependency 'tech.pegasys.discovery:discovery:24.6.0'
} }
} }

Write Preview
Loading…
Cancel
Save