mirror of
https://github.com/vacp2p/linea-besu.git
synced 2026-01-08 20:47:59 -05:00
Merge branch 'main' into zkbesu
# Conflicts: # .github/workflows/acceptance-tests.yml # .github/workflows/codeql.yml # .github/workflows/integration-tests.yml # .github/workflows/pre-review.yml # .github/workflows/reference-tests.yml # build.gradle
This commit is contained in:
@@ -26,18 +26,18 @@ javaPlatform {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api platform('com.fasterxml.jackson:jackson-bom:2.18.0')
|
||||
api platform('io.grpc:grpc-bom:1.68.0')
|
||||
api platform('com.fasterxml.jackson:jackson-bom:2.18.2')
|
||||
api platform('io.grpc:grpc-bom:1.70.0')
|
||||
api platform('io.netty:netty-bom:4.1.118.Final')
|
||||
api platform('io.opentelemetry:opentelemetry-bom:1.43.0')
|
||||
api platform('io.prometheus:prometheus-metrics-bom:1.3.4')
|
||||
api platform('io.vertx:vertx-stack-depchain:4.5.10')
|
||||
api platform('io.opentelemetry:opentelemetry-bom:1.47.0')
|
||||
api platform('io.prometheus:prometheus-metrics-bom:1.3.5')
|
||||
api platform('io.vertx:vertx-stack-depchain:4.5.13')
|
||||
api platform('javax.inject:javax.inject:1')
|
||||
api platform('org.apache.logging.log4j:log4j-bom:2.24.1')
|
||||
api platform('org.assertj:assertj-bom:3.26.3')
|
||||
api platform('org.apache.logging.log4j:log4j-bom:2.24.3')
|
||||
api platform('org.assertj:assertj-bom:3.27.3')
|
||||
api platform('org.immutables:bom:2.10.1')
|
||||
api platform('org.junit:junit-bom:5.11.2')
|
||||
api platform('org.mockito:mockito-bom:5.14.2')
|
||||
api platform('org.junit:junit-bom:5.11.4')
|
||||
api platform('org.mockito:mockito-bom:5.15.2')
|
||||
api platform('org.slf4j:slf4j-bom:2.0.16')
|
||||
|
||||
constraints {
|
||||
@@ -47,6 +47,7 @@ dependencies {
|
||||
api project(':consensus:clique')
|
||||
api project(':consensus:common')
|
||||
api project(':consensus:ibft')
|
||||
api project(':consensus:ibftlegacy')
|
||||
api project(':consensus:merge')
|
||||
api project(':consensus:qbft')
|
||||
api project(':consensus:qbft-core')
|
||||
@@ -68,16 +69,16 @@ dependencies {
|
||||
api project(':testutil')
|
||||
api project(':util')
|
||||
|
||||
api 'com.github.ben-manes.caffeine:caffeine:3.1.8'
|
||||
api 'com.github.ben-manes.caffeine:caffeine:3.2.0'
|
||||
|
||||
api 'com.github.oshi:oshi-core:6.6.5'
|
||||
api 'com.github.oshi:oshi-core:6.6.6'
|
||||
|
||||
api 'com.google.auto.service:auto-service:1.1.1'
|
||||
|
||||
api 'com.google.dagger:dagger-compiler:2.52'
|
||||
api 'com.google.dagger:dagger:2.52'
|
||||
api 'com.google.dagger:dagger-compiler:2.55'
|
||||
api 'com.google.dagger:dagger:2.55'
|
||||
|
||||
api 'com.google.guava:guava:33.3.1-jre'
|
||||
api 'com.google.guava:guava:33.4.0-jre'
|
||||
|
||||
api 'com.google.protobuf:protobuf-java:3.25.5'
|
||||
|
||||
@@ -87,20 +88,19 @@ dependencies {
|
||||
|
||||
api 'com.squareup.okhttp3:okhttp:4.12.0'
|
||||
|
||||
api 'commons-io:commons-io:2.17.0'
|
||||
api 'commons-io:commons-io:2.18.0'
|
||||
|
||||
api 'commons-net:commons-net:3.11.1'
|
||||
|
||||
api 'dnsjava:dnsjava:3.6.2'
|
||||
api 'dnsjava:dnsjava:3.6.3'
|
||||
|
||||
api 'info.picocli:picocli:4.7.6'
|
||||
api 'info.picocli:picocli-codegen:4.7.6'
|
||||
|
||||
api 'io.kubernetes:client-java:21.0.1-legacy'
|
||||
|
||||
api 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:2.9.0-alpha'
|
||||
api 'io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha'
|
||||
api 'io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha'
|
||||
api 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:2.13.1-alpha'
|
||||
api 'io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha'
|
||||
api 'io.opentelemetry.semconv:opentelemetry-semconv:1.30.0'
|
||||
api 'io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.30.0-alpha'
|
||||
|
||||
api 'io.opentracing:opentracing-api:0.33.0'
|
||||
api 'io.opentracing:opentracing-util:0.33.0'
|
||||
@@ -108,17 +108,17 @@ dependencies {
|
||||
|
||||
api 'io.pkts:pkts-core:3.0.10'
|
||||
|
||||
api 'io.tmio:tuweni-bytes:2.4.2'
|
||||
api 'io.tmio:tuweni-config:2.4.2'
|
||||
api 'io.tmio:tuweni-concurrent:2.4.2'
|
||||
api 'io.tmio:tuweni-crypto:2.4.2'
|
||||
api 'io.tmio:tuweni-io:2.4.2'
|
||||
api 'io.tmio:tuweni-net:2.4.2'
|
||||
api 'io.tmio:tuweni-rlp:2.4.2'
|
||||
api 'io.tmio:tuweni-toml:2.4.2'
|
||||
api 'io.tmio:tuweni-units:2.4.2'
|
||||
api 'io.consensys.protocols:tuweni-bytes:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-config:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-concurrent:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-crypto:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-io:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-net:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-rlp:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-toml:2.6.0'
|
||||
api 'io.consensys.protocols:tuweni-units:2.6.0'
|
||||
|
||||
api 'net.java.dev.jna:jna:5.15.0'
|
||||
api 'net.java.dev.jna:jna:5.16.0'
|
||||
|
||||
api 'org.antlr:antlr4:4.11.1'
|
||||
api 'org.antlr:antlr4-runtime:4.11.1'
|
||||
@@ -126,35 +126,36 @@ dependencies {
|
||||
api 'org.apache.commons:commons-collections4:4.4'
|
||||
api 'org.apache.commons:commons-compress:1.27.1'
|
||||
api 'org.apache.commons:commons-lang3:3.17.0'
|
||||
api 'org.apache.commons:commons-text:1.12.0'
|
||||
api 'org.apache.commons:commons-text:1.13.0'
|
||||
|
||||
api 'org.apache.maven:maven-artifact:3.9.9'
|
||||
|
||||
api 'org.awaitility:awaitility:4.2.2'
|
||||
api 'org.awaitility:awaitility:4.3.0'
|
||||
|
||||
api 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
|
||||
api 'org.bouncycastle:bcprov-jdk18on:1.78.1'
|
||||
api 'org.bouncycastle:bcpkix-jdk18on:1.80'
|
||||
api 'org.bouncycastle:bcprov-jdk18on:1.80'
|
||||
|
||||
api 'org.fusesource.jansi:jansi:2.4.1'
|
||||
|
||||
api 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
|
||||
api 'org.hibernate.validator:hibernate-validator:8.0.2.Final'
|
||||
|
||||
api 'org.hyperledger.besu:arithmetic:1.1.2'
|
||||
api 'org.hyperledger.besu:blake2bf:1.1.2'
|
||||
api 'org.hyperledger.besu:gnark:1.1.2'
|
||||
api 'org.hyperledger.besu:ipa-multipoint:1.1.2'
|
||||
api 'org.hyperledger.besu:secp256k1:1.1.2'
|
||||
api 'org.hyperledger.besu:secp256r1:1.1.2'
|
||||
api 'org.hyperledger.besu:besu-native-common:1.3.0'
|
||||
api 'org.hyperledger.besu:arithmetic:1.3.0'
|
||||
api 'org.hyperledger.besu:blake2bf:1.3.0'
|
||||
api 'org.hyperledger.besu:gnark:1.3.0'
|
||||
api 'org.hyperledger.besu:ipa-multipoint:1.3.0'
|
||||
api 'org.hyperledger.besu:secp256k1:1.3.0'
|
||||
api 'org.hyperledger.besu:secp256r1:1.3.0'
|
||||
|
||||
api 'org.hyperledger.besu:besu-errorprone-checks:1.0.0'
|
||||
|
||||
api 'org.jacoco:org.jacoco.agent:0.8.12'
|
||||
api 'org.jacoco:org.jacoco.core:0.8.12'
|
||||
|
||||
api 'org.junit.platform:junit-platform-runner:1.9.2'
|
||||
api 'org.junit.platform:junit-platform-runner:1.12.0'
|
||||
|
||||
api 'org.jupnp:org.jupnp:3.0.2'
|
||||
api 'org.jupnp:org.jupnp.support:3.0.2'
|
||||
api 'org.jupnp:org.jupnp:3.0.3'
|
||||
api 'org.jupnp:org.jupnp.support:3.0.3'
|
||||
|
||||
api 'org.openjdk.jmh:jmh-core:1.37'
|
||||
api 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
|
||||
@@ -165,19 +166,17 @@ dependencies {
|
||||
|
||||
api 'org.rocksdb:rocksdbjni:9.7.3'
|
||||
|
||||
api 'org.springframework.security:spring-security-crypto:6.3.3'
|
||||
api 'org.springframework.security:spring-security-crypto:6.4.3'
|
||||
|
||||
api 'org.wiremock:wiremock:3.9.1'
|
||||
|
||||
api 'org.web3j:abi:4.12.2'
|
||||
api 'org.web3j:besu:4.12.2'
|
||||
api 'org.web3j:core:4.12.2'
|
||||
api 'org.web3j:crypto:4.12.2'
|
||||
api 'org.web3j:abi:4.12.3'
|
||||
api 'org.web3j:besu:4.12.3'
|
||||
api 'org.web3j:core:4.12.3'
|
||||
api 'org.web3j:crypto:4.12.3'
|
||||
api 'org.web3j:quorum:4.10.0'
|
||||
|
||||
api 'org.xerial.snappy:snappy-java:1.1.10.7'
|
||||
|
||||
api 'tech.pegasys:jc-kzg-4844:1.0.0'
|
||||
api 'io.consensys.protocols:jc-kzg-4844:2.0.0'
|
||||
|
||||
api 'tech.pegasys.discovery:discovery:25.2.0'
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user