diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cc2b578438..40bdb40ed1c 100644 --- 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 index f9ff1e80121..792355417f4 100644 --- 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/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java index 49b9659fd9d..6a1bbea2608 100644 --- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java +++ b/ethereum/api/src/integration-test/java/org/hyperledger/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/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java index bd98bee5adc..e15fe417a86 100644 --- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java +++ b/ethereum/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 index 8c0af450fd3..06c6f8d27de 100644 --- 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)?" }, diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f9304c9f8e2..3778a2d60ad 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -86,12 +86,12 @@ - - - + + + - - + + @@ -104,16 +104,16 @@ - - - - - + + + + + @@ -134,6 +134,11 @@ + + + + + @@ -154,21 +159,16 @@ - - - - - - - - - - + + + + + @@ -179,16 +179,16 @@ - - - - - + + + + + @@ -213,12 +213,12 @@ - - - + + + - - + + @@ -253,6 +253,14 @@ + + + + + + + + @@ -277,55 +285,55 @@ - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + @@ -352,46 +360,46 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -426,6 +434,17 @@ + + + + + + + + + + + @@ -453,6 +472,14 @@ + + + + + + + + @@ -461,6 +488,14 @@ + + + + + + + + @@ -477,6 +512,14 @@ + + + + + + + + @@ -485,6 +528,14 @@ + + + + + + + + @@ -493,6 +544,14 @@ + + + + + + + + @@ -517,17 +576,17 @@ - - - + + + - - + + - - - + + + @@ -559,33 +618,33 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -635,12 +694,12 @@ - - - + + + - - + + @@ -651,9 +710,9 @@ - - - + + + @@ -661,6 +720,19 @@ + + + + + + + + + + + + + @@ -677,6 +749,14 @@ + + + + + + + + @@ -687,41 +767,46 @@ + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -732,40 +817,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -782,31 +851,21 @@ - - - - - - - - - - - - - - - + + + + + @@ -870,14 +929,6 @@ - - - - - - - - @@ -886,23 +937,15 @@ - - - - - - - - - - - + + + - - + + - - + + @@ -910,14 +953,9 @@ - - - - - - - - + + + @@ -928,30 +966,30 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + @@ -967,12 +1005,12 @@ - - - + + + - - + + @@ -990,9 +1028,9 @@ - - - + + + @@ -1016,20 +1054,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -1047,9 +1085,9 @@ - - - + + + @@ -1076,31 +1114,23 @@ - - - + + + - - + + - - - + + + - - - - - - - + + - - - - - + + @@ -1111,6 +1141,14 @@ + + + + + + + + @@ -1124,28 +1162,28 @@ - - - + + + - - + + - - + + - - - + + + - - - + + + - - + + @@ -1215,6 +1253,17 @@ + + + + + + + + + + + @@ -1305,6 +1354,14 @@ + + + + + + + + @@ -1322,9 +1379,6 @@ - - - @@ -1337,6 +1391,14 @@ + + + + + + + + @@ -1361,12 +1423,12 @@ - - - + + + - - + + @@ -1385,20 +1447,12 @@ - - - - - - - - - - - + + + - - + + @@ -1414,20 +1468,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -1446,6 +1500,17 @@ + + + + + + + + + + + @@ -1467,180 +1532,188 @@ - - - + + + + + + + + + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -1680,22 +1753,22 @@ - - - + + + - - + + - - - + + + - - - + + + @@ -1703,44 +1776,73 @@ - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -1748,84 +1850,113 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1833,20 +1964,28 @@ - - - + + + - - + + - - - + + + - - + + + + + + + + + + @@ -1854,395 +1993,407 @@ - - - + + + - - - + + + - - + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + - - - + + + - - + + - - + + + + + + + - - + + + + - - + + - - - + + + + + + - - + + - - + + - - + + - - - + + + - - + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + @@ -2295,15 +2446,15 @@ - - - + + + - - + + - - + + @@ -2327,15 +2478,15 @@ - - - + + + - - + + - - + + @@ -2441,17 +2592,17 @@ - - - + + + - - - + + + - - + + @@ -2563,49 +2714,49 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2613,9 +2764,9 @@ - - - + + + @@ -2628,12 +2779,12 @@ - - - + + + - - + + @@ -2662,49 +2813,49 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -2778,38 +2929,38 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + @@ -2838,30 +2989,30 @@ - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - + + @@ -2872,20 +3023,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -2996,6 +3147,11 @@ + + + + + @@ -3019,20 +3175,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -3044,9 +3200,6 @@ - - - @@ -3059,6 +3212,14 @@ + + + + + + + + @@ -3125,11 +3286,6 @@ - - - - - @@ -3140,9 +3296,9 @@ - - - + + + @@ -3150,12 +3306,22 @@ - - - + + + + + + + + + + + + + - - + + @@ -3171,14 +3337,6 @@ - - - - - - - - @@ -3187,21 +3345,11 @@ - - - - - - - - - - @@ -3217,14 +3365,6 @@ - - - - - - - - @@ -3233,38 +3373,38 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -3275,51 +3415,51 @@ - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -3340,44 +3480,44 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -3396,25 +3536,25 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -3433,20 +3573,12 @@ - - - + + + - - - - - - - - - - + + @@ -3465,12 +3597,20 @@ - - - + + + - - + + + + + + + + + + @@ -3481,51 +3621,43 @@ - - - - - - - - - - - + + + - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + @@ -3644,173 +3776,173 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + @@ -4712,25 +4844,25 @@ - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -4751,6 +4883,14 @@ + + + + + + + + @@ -4764,12 +4904,17 @@ - - - + + + + + + + + - - + + @@ -4788,12 +4933,12 @@ - - - + + + - - + + @@ -4899,15 +5044,15 @@ - - - + + + - - + + - - + + @@ -4941,12 +5086,12 @@ - - - + + + - - + + @@ -5065,36 +5210,36 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -5121,6 +5266,22 @@ + + + + + + + + + + + + + + + + @@ -5129,6 +5290,14 @@ + + + + + + + + @@ -5161,14 +5330,6 @@ - - - - - - - - @@ -5177,26 +5338,26 @@ - - - + + + - - + + - - + + - - - + + + - - + + - - + + @@ -5207,15 +5368,15 @@ - - - + + + - - + + - - + + @@ -5226,26 +5387,26 @@ - - - + + + - - + + - - + + - - - + + + - - + + - - + + @@ -5261,23 +5422,28 @@ - - - + + + - - + + - - - - - + + + + + + + + + + @@ -5293,12 +5459,12 @@ - - - + + + - - + + @@ -5309,12 +5475,12 @@ - - - + + + - - + + @@ -5333,30 +5499,30 @@ - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + @@ -5364,28 +5530,20 @@ - - - - - - - - - - - + + + - - + + - - - + + + - - + + @@ -5438,12 +5596,12 @@ - - - + + + - - + + @@ -5594,12 +5752,12 @@ - - - + + + - - + + @@ -5615,6 +5773,11 @@ + + + + + @@ -5623,12 +5786,12 @@ - - - + + + - - + + @@ -5639,12 +5802,12 @@ - - - + + + - - + + @@ -5655,17 +5818,17 @@ - - - + + + - - + + - - - + + + @@ -5724,14 +5887,6 @@ - - - - - - - - @@ -5740,9 +5895,12 @@ - - - + + + + + + @@ -5750,12 +5908,17 @@ - - - + + + - - + + + + + + + @@ -5763,19 +5926,19 @@ - - - - - - - - + + + + + + + + @@ -5796,12 +5959,12 @@ - - - + + + - - + + @@ -5819,28 +5982,36 @@ - - - + + + + + + + + + + + - - + + - - + + - - - + + + - - + + - - - + + + @@ -5851,17 +6022,6 @@ - - - - - - - - - - - @@ -5870,15 +6030,26 @@ - - - + + + - - + + - - + + + + + + + + + + + + + @@ -5889,17 +6060,6 @@ - - - - - - - - - - - @@ -5911,15 +6071,15 @@ - - - + + + - - + + - - + + @@ -5930,31 +6090,31 @@ - - - + + + - - + + - - + + - - - + + + - - - - + + - - + + - - + + + + @@ -5965,15 +6125,15 @@ - - - + + + - - + + - - + + @@ -5987,15 +6147,15 @@ - - - + + + - - + + - - + + @@ -6006,6 +6166,17 @@ + + + + + + + + + + + @@ -6035,52 +6206,52 @@ - - - + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + @@ -6110,15 +6281,15 @@ - - - + + + - - + + - - + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index f7599a8498a..b7a286e69a3 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -17,12 +17,7 @@ dependencyManagement { dependencies { applyMavenExclusions = false - dependencySet(group: 'org.antlr', version: '4.11.1') { - entry 'antlr4' - entry 'antlr4-runtime' - } - - dependencySet(group:'com.fasterxml.jackson.core', version:'2.16.1') { + dependencySet(group:'com.fasterxml.jackson.core', version:'2.17.2') { entry 'jackson-databind' entry 'jackson-datatype' entry 'jackson-datatype-jdk8' @@ -30,20 +25,20 @@ dependencyManagement { 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' - dependencySet(group: 'com.google.dagger', version: '2.50') { + dependencySet(group: 'com.google.dagger', version: '2.52') { entry'dagger-compiler' entry'dagger' } 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' @@ -51,16 +46,18 @@ dependencyManagement { 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-codegen' } - dependencySet(group: 'io.grpc', version: '1.60.1') { + dependencySet(group: 'io.grpc', version: '1.66.0') { entry 'grpc-all' entry 'grpc-core' entry 'grpc-netty' @@ -69,22 +66,22 @@ dependencyManagement { dependency 'io.kubernetes:client-java:18.0.1' - dependency 'io.netty:netty-all:4.1.110.Final' - dependency 'io.netty:netty-tcnative-boringssl-static:2.0.62.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-kqueue', version:'4.1.110.Final', classifier: 'osx-x86_64' - dependency 'io.netty:netty-transport-native-unix-common:4.1.110.Final' - - dependency 'io.opentelemetry:opentelemetry-api:1.33.0' - dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.33.0' - dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.33.0' - dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.33.0' - dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.33.0' - dependency 'io.opentelemetry:opentelemetry-sdk:1.33.0' - dependency 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.33.0' - dependency 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.32.0-alpha' - dependency 'io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha' - dependency 'io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha' + dependency 'io.netty:netty-all:4.1.112.Final' + dependency 'io.netty:netty-tcnative-boringssl-static:2.0.66.Final' + 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.112.Final', classifier: 'osx-x86_64' + dependency 'io.netty:netty-transport-native-unix-common:4.1.112.Final' + + dependency 'io.opentelemetry:opentelemetry-api:1.41.0' + dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.41.0' + dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.41.0' + dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.41.0' + dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.41.0' + dependency 'io.opentelemetry:opentelemetry-sdk:1.41.0' + dependency 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.41.0' + dependency 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:2.7.0-alpha' + dependency 'io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha' + dependency 'io.opentelemetry.semconv:opentelemetry-semconv:1.27.0-alpha' dependency 'io.opentracing.contrib:opentracing-okhttp3:3.0.0' dependency 'io.opentracing:opentracing-api:0.33.0' @@ -115,7 +112,7 @@ dependencyManagement { 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-codegen' entry 'vertx-core' @@ -130,24 +127,28 @@ dependencyManagement { dependency 'net.java.dev.jna:jna:5.14.0' - dependency 'org.apache.commons:commons-compress:1.26.0' - dependency 'org.apache.commons:commons-lang3:3.14.0' - dependency 'org.apache.commons:commons-text:1.11.0' + dependencySet(group: 'org.antlr', version: '4.11.1') { + entry 'antlr4' + entry 'antlr4-runtime' + } + 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-core' entry 'log4j-jul' 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'bcprov-jdk18on' } @@ -164,19 +165,21 @@ dependencyManagement { entry 'gnark' } - dependencySet(group: 'org.immutables', version: '2.10.0') { + dependencySet(group: 'org.immutables', version: '2.10.1') { entry 'value-annotations' 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' - dependency 'org.jacoco:org.jacoco.core:0.8.11' + dependencySet(group: 'org.jacoco', version: '0.8.12') { + 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-api' entry 'junit-jupiter-engine' @@ -189,47 +192,47 @@ dependencyManagement { 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' } - dependencySet(group: 'org.mockito', version:'5.8.0') { + dependencySet(group: 'org.mockito', version:'5.13.0') { entry 'mockito-core' 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-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 - dependencySet(group: 'org.slf4j', version:'2.0.10') { + dependencySet(group: 'org.slf4j', version:'2.0.16') { entry 'slf4j-api' 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' - dependencySet(group: 'org.web3j', version: '4.11.1') { + dependencySet(group: 'org.web3j', version: '4.12.1') { entry 'abi' entry 'besu' entry 'core' entry 'crypto' } - dependencySet(group: 'org.wiremock', version: '3.3.1') { + dependencySet(group: 'org.wiremock', version: '3.9.1') { 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' @@ -237,6 +240,6 @@ dependencyManagement { 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' } }