From dfad8bff7856677327c273fe3f59faffd392fea7 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 1 Jan 2020 00:42:13 -0700 Subject: [PATCH] Update Dependencies (#281) Update dependencies to most current version - except picocli which is a major version update Alphabetize dependencies Signed-off-by: Danno Ferrin --- acceptance-tests/dsl/build.gradle | 15 +++--- acceptance-tests/tests/build.gradle | 24 ++++----- besu/build.gradle | 28 +++++----- build.gradle | 4 +- consensus/clique/build.gradle | 12 ++--- consensus/common/build.gradle | 8 +-- consensus/ibft/build.gradle | 17 ++++--- consensus/ibftlegacy/build.gradle | 10 ++-- crypto/build.gradle | 6 +-- enclave/build.gradle | 9 ++-- errorprone-checks/build.gradle | 5 +- ethereum/api/build.gradle | 40 +++++++-------- ethereum/blockcreation/build.gradle | 15 +++--- ethereum/core/build.gradle | 20 ++++---- ethereum/eth/build.gradle | 13 +++-- ethereum/mock-p2p/build.gradle | 2 +- ethereum/p2p/build.gradle | 6 +-- ethereum/permissioning/build.gradle | 11 ++-- ethereum/retesteth/build.gradle | 28 +++++----- ethereum/rlp/build.gradle | 10 ++-- ethereum/stratum/build.gradle | 6 +-- ethereum/trie/build.gradle | 6 +-- gradle/versions.gradle | 65 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- metrics/core/build.gradle | 3 +- plugins/rocksdb/build.gradle | 2 +- services/kvstore/build.gradle | 4 +- services/pipeline/build.gradle | 3 +- services/tasks/build.gradle | 4 +- testutil/build.gradle | 6 +-- util/build.gradle | 4 +- 31 files changed, 195 insertions(+), 193 deletions(-) diff --git a/acceptance-tests/dsl/build.gradle b/acceptance-tests/dsl/build.gradle index f847ead44c..3941406bea 100644 --- a/acceptance-tests/dsl/build.gradle +++ b/acceptance-tests/dsl/build.gradle @@ -1,23 +1,19 @@ dependencies { - - implementation 'org.apache.logging.log4j:log4j-core' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl' - + implementation project(':besu') implementation project(':config') implementation project(':consensus:clique') implementation project(':consensus:ibft') implementation project(':crypto') implementation project(':enclave') + implementation project(':ethereum:api') implementation project(':ethereum:blockcreation') implementation project(':ethereum:core') implementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') implementation project(':ethereum:eth') - implementation project(':ethereum:api') implementation project(':ethereum:p2p') implementation project(':ethereum:permissioning') implementation project(':ethereum:rlp') implementation project(':metrics:core') - implementation project(':besu') implementation project(':plugin-api') implementation project(':plugins:rocksdb') implementation project(':services:kvstore') @@ -32,10 +28,12 @@ dependencies { implementation 'io.vertx:vertx-core' implementation 'junit:junit' implementation 'net.consensys:orion' - + implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.logging.log4j:log4j-core' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl' implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-io' implementation 'org.apache.tuweni:tuweni-units' - implementation 'org.apache.logging.log4j:log4j-api' implementation 'org.assertj:assertj-core' implementation 'org.awaitility:awaitility' implementation 'org.java-websocket:Java-WebSocket' @@ -45,5 +43,4 @@ dependencies { implementation 'tech.pegasys.ethsigner.internal:core' implementation 'tech.pegasys.ethsigner.internal:file-based' implementation 'tech.pegasys.ethsigner.internal:signing-api' - implementation 'org.apache.tuweni:tuweni-io' } diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle index 0f8e9354ea..1e936e148c 100644 --- a/acceptance-tests/tests/build.gradle +++ b/acceptance-tests/tests/build.gradle @@ -12,25 +12,25 @@ */ dependencies { + testImplementation project(':acceptance-tests:dsl') + testImplementation project(':besu') + testImplementation project(':consensus:clique') + testImplementation project(':enclave') + testImplementation project(':ethereum:api') + testImplementation project(':ethereum:core') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + testImplementation project(':ethereum:permissioning') + testImplementation project(':plugin-api') + testImplementation project(':testutil') + testImplementation project(':util') testImplementation 'junit:junit' testImplementation 'net.consensys:orion' testImplementation 'org.apache.tuweni:tuweni-crypto' testImplementation 'org.assertj:assertj-core' + testImplementation 'org.awaitility:awaitility' testImplementation 'org.web3j:abi' testImplementation 'org.web3j:besu' - testImplementation project(':ethereum:api') - testImplementation project(':acceptance-tests:dsl') - testImplementation project(':enclave') - testImplementation 'org.awaitility:awaitility' - testImplementation project(':consensus:clique') - testImplementation project(':ethereum:permissioning') - testImplementation project(':util') - testImplementation project(':plugin-api') - testImplementation project(':besu') - testImplementation project(':ethereum:core') - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') - testImplementation project(':testutil') testImplementation 'tech.pegasys.ethsigner.internal:core' testImplementation 'tech.pegasys.ethsigner.internal:file-based' } diff --git a/besu/build.gradle b/besu/build.gradle index 9b60bd682d..f03f4727f5 100644 --- a/besu/build.gradle +++ b/besu/build.gradle @@ -29,18 +29,18 @@ jar { dependencies { implementation project(':config') - implementation project(':crypto') - implementation project(':consensus:common') implementation project(':consensus:clique') + implementation project(':consensus:common') implementation project(':consensus:ibft') implementation project(':consensus:ibftlegacy') + implementation project(':crypto') implementation project(':enclave') + implementation project(':ethereum:api') implementation project(':ethereum:blockcreation') implementation project(':ethereum:core') implementation project(':ethereum:eth') - implementation project(':ethereum:api') - implementation project(':ethereum:permissioning') implementation project(':ethereum:p2p') + implementation project(':ethereum:permissioning') implementation project(':ethereum:retesteth') implementation project(':ethereum:rlp') implementation project(':ethereum:stratum') @@ -51,33 +51,33 @@ dependencies { implementation project(':services:kvstore') implementation 'com.fasterxml.jackson.core:jackson-databind' - compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jdk8', version: '2.9.8' - implementation 'com.graphql-java:graphql-java' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8' implementation 'com.google.guava:guava' + implementation 'com.graphql-java:graphql-java' implementation 'info.picocli:picocli' implementation 'io.vertx:vertx-core' implementation 'io.vertx:vertx-web' - implementation 'org.apache.tuweni:tuweni-config' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-config' + implementation 'org.apache.tuweni:tuweni-units' implementation 'org.springframework.security:spring-security-crypto' runtime 'org.apache.logging.log4j:log4j-core' runtime 'org.apache.logging.log4j:log4j-slf4j-impl' - testImplementation project(':testutil') testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + testImplementation project(':testutil') - testImplementation 'org.apache.tuweni:tuweni-bytes' - testImplementation 'org.apache.tuweni:tuweni-units' - testImplementation 'com.squareup.okhttp3:okhttp' testImplementation 'com.google.auto.service:auto-service' + testImplementation 'com.squareup.okhttp3:okhttp' testImplementation 'junit:junit' + testImplementation 'org.apache.commons:commons-text' + testImplementation 'org.apache.tuweni:tuweni-bytes' + testImplementation 'org.apache.tuweni:tuweni-units' testImplementation 'org.assertj:assertj-core' testImplementation 'org.awaitility:awaitility' testImplementation 'org.mockito:mockito-core' - testImplementation 'org.apache.commons:commons-text' } task testJar(type: Jar) { diff --git a/build.gradle b/build.gradle index a2c39e0449..cc88b641cd 100644 --- a/build.gradle +++ b/build.gradle @@ -125,7 +125,7 @@ allprojects { maven { url "https://repository.apache.org/content/repositories/snapshots/" } } - dependencies { errorprone("com.google.errorprone:error_prone_core") } + dependencies { errorprone "com.google.errorprone:error_prone_core" } apply plugin: 'com.diffplug.gradle.spotless' spotless { @@ -477,7 +477,7 @@ startScripts { dependencies { - compile project(':besu') + implementation project(':besu') errorprone 'com.google.errorprone:error_prone_core' } diff --git a/consensus/clique/build.gradle b/consensus/clique/build.gradle index e2f70230a7..407591267a 100644 --- a/consensus/clique/build.gradle +++ b/consensus/clique/build.gradle @@ -33,24 +33,24 @@ dependencies { implementation project(':config') implementation project(':consensus:common') implementation project(':crypto') - implementation project(':ethereum:core') + implementation project(':ethereum:api') implementation project(':ethereum:blockcreation') + implementation project(':ethereum:core') implementation project(':ethereum:eth') - implementation project(':ethereum:api') - implementation project(':ethereum:rlp') implementation project(':ethereum:p2p') + implementation project(':ethereum:rlp') implementation project(':services:kvstore') implementation project(':util') - implementation 'io.vertx:vertx-core' implementation 'com.google.guava:guava' + implementation 'io.vertx:vertx-core' implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-units' - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(path: ':consensus:common', configuration: 'testArtifacts') - testImplementation project(':testutil') testImplementation project(':metrics:core') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + testImplementation project(':testutil') testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' diff --git a/consensus/common/build.gradle b/consensus/common/build.gradle index 4dc46399c5..007679f05e 100644 --- a/consensus/common/build.gradle +++ b/consensus/common/build.gradle @@ -30,20 +30,20 @@ jar { dependencies { api project(':plugin-api') - implementation project(':ethereum:core') - implementation project(':ethereum:api') implementation project(':crypto') + implementation project(':ethereum:api') + implementation project(':ethereum:core') implementation project(':util') - implementation 'org.apache.tuweni:tuweni-bytes' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.google.guava:guava' + implementation 'org.apache.tuweni:tuweni-bytes' testImplementation project(':crypto') testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation 'junit:junit' - testImplementation "org.assertj:assertj-core" + testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' } configurations { testArtifacts } diff --git a/consensus/ibft/build.gradle b/consensus/ibft/build.gradle index be604f301d..e482a3b5a7 100644 --- a/consensus/ibft/build.gradle +++ b/consensus/ibft/build.gradle @@ -31,33 +31,34 @@ dependencies { implementation project(':config') implementation project(':consensus:common') implementation project(':crypto') + implementation project(':ethereum:api') implementation project(':ethereum:blockcreation') implementation project(':ethereum:core') implementation project(':ethereum:eth') - implementation project(':ethereum:api') - implementation project(':ethereum:rlp') implementation project(':ethereum:p2p') + implementation project(':ethereum:rlp') implementation project(':services:kvstore') + implementation 'com.google.guava:guava' + implementation 'io.vertx:vertx-core' implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-units' - implementation 'io.vertx:vertx-core' - implementation 'com.google.guava:guava' - integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') integrationTestImplementation project(path: ':config:', configuration: 'testSupportArtifacts') + integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(path: ':config:', configuration: 'testSupportArtifacts') testImplementation project(path: ':consensus:common', configuration: 'testArtifacts') - testImplementation project(':testutil') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(':metrics:core') + testImplementation project(':testutil') integrationTestImplementation project(':metrics:core') + integrationTestImplementation project(':testutil') + integrationTestImplementation 'junit:junit' integrationTestImplementation 'org.assertj:assertj-core' integrationTestImplementation 'org.mockito:mockito-core' - integrationTestImplementation project(':testutil') testImplementation 'junit:junit' testImplementation 'org.awaitility:awaitility' diff --git a/consensus/ibftlegacy/build.gradle b/consensus/ibftlegacy/build.gradle index a75dce4b8d..4b6899ffea 100644 --- a/consensus/ibftlegacy/build.gradle +++ b/consensus/ibftlegacy/build.gradle @@ -17,24 +17,24 @@ dependencies { implementation project(':consensus:common') implementation project(':consensus:ibft') implementation project(':crypto') + implementation project(':ethereum:api') implementation project(':ethereum:blockcreation') implementation project(':ethereum:core') implementation project(':ethereum:eth') - implementation project(':ethereum:api') - implementation project(':ethereum:rlp') implementation project(':ethereum:p2p') + implementation project(':ethereum:rlp') implementation project(':metrics:core') implementation project(':services:kvstore') implementation 'com.google.guava:guava' + implementation 'io.vertx:vertx-core' implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-units' - implementation 'io.vertx:vertx-core' - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(path: ':consensus:ibft', configuration: 'testSupportArtifacts') - testImplementation project(':testutil') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(':metrics:core') + testImplementation project(':testutil') testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' diff --git a/crypto/build.gradle b/crypto/build.gradle index f9caa3a091..50ff7dee93 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -33,14 +33,14 @@ dependencies { api 'org.bouncycastle:bcprov-jdk15on' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' runtime 'org.apache.logging.log4j:log4j-core' + testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' - testImplementation 'junit:junit' } diff --git a/enclave/build.gradle b/enclave/build.gradle index 78af46efe8..c2ef68b028 100644 --- a/enclave/build.gradle +++ b/enclave/build.gradle @@ -1,16 +1,17 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'org.apache.logging.log4j:log4j-api' implementation 'io.vertx:vertx-core' + implementation 'org.apache.logging.log4j:log4j-api' // test dependencies. - testImplementation 'junit:junit' testImplementation project(':testutil') + testImplementation 'junit:junit' + // integration test dependencies. - integrationTestImplementation 'junit:junit' - integrationTestImplementation 'org.assertj:assertj-core' integrationTestImplementation project(':testutil') + integrationTestImplementation 'junit:junit' integrationTestImplementation 'net.consensys:orion' + integrationTestImplementation 'org.assertj:assertj-core' } diff --git a/errorprone-checks/build.gradle b/errorprone-checks/build.gradle index 36645d5e0a..c7b36c7351 100644 --- a/errorprone-checks/build.gradle +++ b/errorprone-checks/build.gradle @@ -30,12 +30,11 @@ sourceCompatibility = 11 targetCompatibility = 11 dependencies { + annotationProcessor 'com.google.auto.service:auto-service' + implementation 'com.google.auto.service:auto-service' implementation 'com.google.errorprone:error_prone_annotation' implementation 'com.google.errorprone:error_prone_core' - implementation 'com.google.auto.service:auto-service' - - annotationProcessor 'com.google.auto.service:auto-service' testImplementation 'com.google.errorprone:error_prone_test_helpers' testImplementation 'junit:junit' diff --git a/ethereum/api/build.gradle b/ethereum/api/build.gradle index 41b14dd328..fa9198bdae 100644 --- a/ethereum/api/build.gradle +++ b/ethereum/api/build.gradle @@ -28,45 +28,45 @@ jar { } dependencies { + implementation project(':config') + implementation project(':crypto') + implementation project(':enclave') implementation project(':ethereum:blockcreation') implementation project(':ethereum:core') implementation project(':ethereum:eth') implementation project(':ethereum:p2p') - implementation project(':ethereum:rlp') implementation project(':ethereum:permissioning') + implementation project(':ethereum:rlp') implementation project(':metrics:core') implementation project(':nat') implementation project(':plugin-api') - implementation project(':enclave') implementation project(':util') - implementation project(':config') - implementation project(':crypto') - implementation 'org.springframework.security:spring-security-crypto' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-toml' - implementation 'org.apache.tuweni:tuweni-units' - implementation 'com.graphql-java:graphql-java' implementation 'com.google.guava:guava' - implementation 'io.vertx:vertx-core' - implementation 'io.vertx:vertx-web' + implementation 'com.graphql-java:graphql-java' implementation 'io.vertx:vertx-auth-jwt' + implementation 'io.vertx:vertx-core' implementation 'io.vertx:vertx-unit' + implementation 'io.vertx:vertx-web' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-toml' + implementation 'org.apache.tuweni:tuweni-units' implementation 'org.bouncycastle:bcprov-jdk15on' + implementation 'org.springframework.security:spring-security-crypto' - testImplementation 'com.squareup.okhttp3:okhttp' - testImplementation 'junit:junit' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.mockito:mockito-core' - testImplementation 'io.vertx:vertx-codegen' - testImplementation 'io.vertx:vertx-unit' - - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') - testImplementation project(':testutil') testImplementation project(':config') testImplementation project(path: ':config', configuration: 'testSupportArtifacts') testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(':services:kvstore') + testImplementation project(':testutil') + + testImplementation 'com.squareup.okhttp3:okhttp' + testImplementation 'io.vertx:vertx-codegen' + testImplementation 'io.vertx:vertx-unit' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.mockito:mockito-core' integrationTestImplementation project(':config') integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts') diff --git a/ethereum/blockcreation/build.gradle b/ethereum/blockcreation/build.gradle index 0b627e7c48..1ed4c24350 100644 --- a/ethereum/blockcreation/build.gradle +++ b/ethereum/blockcreation/build.gradle @@ -13,23 +13,24 @@ jar { } dependencies { - implementation project(':ethereum:core') - implementation project(':ethereum:eth') - implementation project(':util') implementation project(':config') implementation project(':crypto') + implementation project(':ethereum:core') + implementation project(':ethereum:eth') implementation project(':services:kvstore') + implementation project(':util') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' testImplementation project(path: ':config', configuration: 'testSupportArtifacts') - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts') - testImplementation project(':testutil') + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(':metrics:core') + testImplementation project(':testutil') + testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.awaitility:awaitility' diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle index e86ef72fd8..ce5374065e 100644 --- a/ethereum/core/build.gradle +++ b/ethereum/core/build.gradle @@ -28,6 +28,8 @@ jar { } dependencies { + annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess' + implementation project(':config') implementation project(':crypto') implementation project(':enclave') @@ -37,12 +39,12 @@ dependencies { implementation project(':plugin-api') implementation project(':services:kvstore') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' runtime 'org.apache.logging.log4j:log4j-core' @@ -51,39 +53,37 @@ dependencies { testImplementation project(':testutil') testImplementation 'junit:junit' - testImplementation 'org.assertj:assertj-core' - testImplementation 'org.mockito:mockito-core' testImplementation 'org.apache.tuweni:tuweni-bytes' testImplementation 'org.apache.tuweni:tuweni-io' testImplementation 'org.apache.tuweni:tuweni-units' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.mockito:mockito-core' integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts') + integrationTestImplementation project(':testutil') integrationTestImplementation 'junit:junit' + integrationTestImplementation 'net.consensys:orion' integrationTestImplementation 'org.assertj:assertj-core' integrationTestImplementation 'org.mockito:mockito-core' - integrationTestImplementation project(':testutil') - integrationTestImplementation 'net.consensys:orion' testSupportImplementation project(path: ':config', configuration: 'testSupportArtifacts') - testSupportImplementation project(':testutil') testSupportImplementation project(':ethereum:eth') + testSupportImplementation project(':testutil') testSupportImplementation 'junit:junit' testSupportImplementation 'org.assertj:assertj-core' testSupportImplementation 'org.mockito:mockito-core' - compileOnly 'org.openjdk.jmh:jmh-generator-annprocess' - jmhImplementation project(path: ':config', configuration: 'testSupportArtifacts') jmhImplementation project(':crypto') jmhImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') jmhImplementation project(':ethereum:rlp') jmhImplementation project(':ethereum:trie') jmhImplementation project(':metrics:core') - jmhImplementation project(':services:kvstore') jmhImplementation project(':plugin-api') jmhImplementation project(':plugins:rocksdb') + jmhImplementation project(':services:kvstore') jmhImplementation project(':util') jmhImplementation 'com.google.guava:guava' diff --git a/ethereum/eth/build.gradle b/ethereum/eth/build.gradle index 3de3f9bb7b..fef0e0512c 100644 --- a/ethereum/eth/build.gradle +++ b/ethereum/eth/build.gradle @@ -28,23 +28,22 @@ jar { } dependencies { - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' + annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess' implementation project(':ethereum:core') implementation project(':ethereum:p2p') + implementation project(':ethereum:permissioning') implementation project(':ethereum:rlp') implementation project(':ethereum:trie') - implementation project(':ethereum:permissioning') implementation project(':metrics:core') implementation project(':services:kvstore') implementation project(':services:pipeline') implementation project(':services:tasks') - implementation 'io.vertx:vertx-core' implementation 'com.google.guava:guava' - - compileOnly 'org.openjdk.jmh:jmh-generator-annprocess' + implementation 'io.vertx:vertx-core' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' testImplementation project(':config') testImplementation project(path: ':config', configuration: 'testSupportArtifacts') @@ -61,8 +60,8 @@ dependencies { testImplementation 'org.mockito:mockito-core' jmhImplementation project(':besu') - jmhImplementation project(':plugins:rocksdb') jmhImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + jmhImplementation project(':plugins:rocksdb') integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts') } diff --git a/ethereum/mock-p2p/build.gradle b/ethereum/mock-p2p/build.gradle index e67fb90f2c..69a71694c8 100644 --- a/ethereum/mock-p2p/build.gradle +++ b/ethereum/mock-p2p/build.gradle @@ -34,8 +34,8 @@ dependencies { implementation project(':ethereum:permissioning') implementation project(':util') - implementation 'org.apache.tuweni:tuweni-bytes' implementation 'io.vertx:vertx-core' + implementation 'org.apache.tuweni:tuweni-bytes' testImplementation "junit:junit" testImplementation 'org.assertj:assertj-core' diff --git a/ethereum/p2p/build.gradle b/ethereum/p2p/build.gradle index 45bad64516..c0cf524473 100644 --- a/ethereum/p2p/build.gradle +++ b/ethereum/p2p/build.gradle @@ -34,12 +34,12 @@ dependencies { implementation project(':metrics:core') implementation project(':nat') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'io.prometheus:simpleclient' implementation 'io.vertx:vertx-core' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' implementation 'org.xerial.snappy:snappy-java' runtime 'org.apache.logging.log4j:log4j-core' @@ -53,8 +53,8 @@ dependencies { exclude group: 'io.pkts', module: 'pkts-sdp' exclude group: 'io.pkts', module: 'pkts-sip' } - testImplementation 'io.vertx:vertx-unit' testImplementation 'io.vertx:vertx-codegen' + testImplementation 'io.vertx:vertx-unit' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.awaitility:awaitility' diff --git a/ethereum/permissioning/build.gradle b/ethereum/permissioning/build.gradle index dc2da6543d..5024631a28 100644 --- a/ethereum/permissioning/build.gradle +++ b/ethereum/permissioning/build.gradle @@ -28,22 +28,23 @@ jar { } dependencies { - implementation project(':util') + implementation project(':crypto') implementation project(':ethereum:core') implementation project(':ethereum:p2p') - implementation project(':crypto') implementation project(':metrics:core') + implementation project(':util') implementation 'com.google.guava:guava' + implementation 'org.apache.logging.log4j:log4j-api' implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.apache.tuweni:tuweni-toml' implementation 'org.apache.tuweni:tuweni-units' - implementation 'org.apache.logging.log4j:log4j-api' - testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(':config') - testImplementation 'junit:junit' + testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') + testImplementation 'io.vertx:vertx-core' + testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' } diff --git a/ethereum/retesteth/build.gradle b/ethereum/retesteth/build.gradle index 00b7e4c438..ff0ec94ee1 100644 --- a/ethereum/retesteth/build.gradle +++ b/ethereum/retesteth/build.gradle @@ -26,25 +26,25 @@ jar { } dependencies { - implementation(project(':config')) - implementation(project(':ethereum:blockcreation')) - implementation(project(':ethereum:core')) - implementation(project(':ethereum:eth')) - implementation(project(':ethereum:api')) - implementation(project(':ethereum:api')) - implementation(project(':ethereum:rlp')) - implementation(project(':ethereum:p2p')) - implementation(project(':metrics:core')) - implementation(project(':nat')) - implementation(project(':services:kvstore')) - implementation(project(':util')) + implementation project(':config') + implementation project(':ethereum:api') + implementation project(':ethereum:api') + implementation project(':ethereum:blockcreation') + implementation project(':ethereum:core') + implementation project(':ethereum:eth') + implementation project(':ethereum:p2p') + implementation project(':ethereum:rlp') + implementation project(':metrics:core') + implementation project(':nat') + implementation project(':services:kvstore') + implementation project(':util') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' implementation 'io.vertx:vertx-web' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle index 55863ece02..9964152526 100644 --- a/ethereum/rlp/build.gradle +++ b/ethereum/rlp/build.gradle @@ -28,24 +28,24 @@ jar { } dependencies { + annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess' + api project(':plugin-api') api project(':util') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' - - compileOnly 'org.openjdk.jmh:jmh-generator-annprocess' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' jmh project(':util') testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput') testImplementation project(':testutil') - testImplementation 'org.assertj:assertj-core' testImplementation 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' } test { diff --git a/ethereum/stratum/build.gradle b/ethereum/stratum/build.gradle index ce44073969..5a31041406 100644 --- a/ethereum/stratum/build.gradle +++ b/ethereum/stratum/build.gradle @@ -34,14 +34,14 @@ dependencies { implementation project(':ethereum:api') implementation project(':ethereum:core') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' testImplementation project(':testutil') - testImplementation 'org.assertj:assertj-core' testImplementation 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' } diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle index e1145f01cd..d836732475 100644 --- a/ethereum/trie/build.gradle +++ b/ethereum/trie/build.gradle @@ -32,16 +32,16 @@ dependencies { implementation project(':ethereum:rlp') implementation project(':services:kvstore') - implementation 'org.apache.tuweni:tuweni-bytes' implementation 'com.google.guava:guava' + implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.bouncycastle:bcprov-jdk15on' - testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput') testImplementation project(':testutil') + testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput') - testImplementation 'org.apache.tuweni:tuweni-units' testImplementation 'com.fasterxml.jackson.core:jackson-databind' testImplementation 'junit:junit' + testImplementation 'org.apache.tuweni:tuweni-units' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' } diff --git a/gradle/versions.gradle b/gradle/versions.gradle index f29a8fb204..77a0b68fd3 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -15,17 +15,18 @@ dependencyManagement { dependencies { - dependency 'com.fasterxml.jackson.core:jackson-databind:2.10.0' + dependency 'com.fasterxml.jackson.core:jackson-databind:2.10.1' + dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.1' dependency 'com.github.docker-java:docker-java:3.0.14' - dependency 'com.github.tomakehurst:wiremock-jre8:2.25.0' + dependency 'com.github.tomakehurst:wiremock-jre8:2.25.1' dependency 'com.google.auto.service:auto-service:1.0-rc6' + dependency 'com.google.errorprone:error_prone_annotation:2.3.3' dependency 'com.google.errorprone:error_prone_check_api:2.3.3' dependency 'com.google.errorprone:error_prone_core:2.3.3' - dependency 'com.google.errorprone:error_prone_annotation:2.3.3' dependency 'com.google.errorprone:error_prone_test_helpers:2.3.3' dependency 'com.google.guava:guava:28.1-jre' @@ -33,19 +34,19 @@ dependencyManagement { dependency 'com.graphql-java:graphql-java:13.0' dependency 'com.squareup.okhttp3:okhttp:4.2.2' - + dependency 'commons-cli:commons-cli:1.4' dependency 'info.picocli:picocli:3.9.6' dependency 'io.pkts:pkts-core:3.0.5' - dependency 'io.prometheus:simpleclient:0.7.0' - dependency 'io.prometheus:simpleclient_common:0.7.0' - dependency 'io.prometheus:simpleclient_hotspot:0.7.0' - dependency 'io.prometheus:simpleclient_pushgateway:0.7.0' + dependency 'io.prometheus:simpleclient:0.8.0' + dependency 'io.prometheus:simpleclient_common:0.8.0' + dependency 'io.prometheus:simpleclient_hotspot:0.8.0' + dependency 'io.prometheus:simpleclient_pushgateway:0.8.0' - dependency 'io.reactivex.rxjava2:rxjava:2.2.13' + dependency 'io.reactivex.rxjava2:rxjava:2.2.16' dependency 'io.vertx:vertx-auth-jwt:3.8.0' dependency 'io.vertx:vertx-codegen:3.8.0' @@ -55,22 +56,22 @@ dependencyManagement { dependency 'junit:junit:4.12' + dependency 'net.consensys:orion:1.5.0-SNAPSHOT' + + dependency 'org.apache.commons:commons-text:1.8' + + dependency 'org.apache.logging.log4j:log4j-api:2.13.0' + dependency 'org.apache.logging.log4j:log4j-core:2.13.0' + dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.0' + dependency 'org.apache.tuweni:tuweni-bytes:0.10.0' - dependency 'org.apache.tuweni:tuweni-io:0.10.0' dependency 'org.apache.tuweni:tuweni-config:0.10.0' dependency 'org.apache.tuweni:tuweni-crypto:0.10.0' + dependency 'org.apache.tuweni:tuweni-io:0.10.0' dependency 'org.apache.tuweni:tuweni-toml:0.10.0' dependency 'org.apache.tuweni:tuweni-units:0.10.0' - dependency 'net.consensys:orion:1.5.0-SNAPSHOT' - - dependency 'org.apache.commons:commons-text:1.8' - - dependency 'org.apache.logging.log4j:log4j-api:2.12.1' - dependency 'org.apache.logging.log4j:log4j-core:2.12.1' - dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.1' - - dependency 'org.assertj:assertj-core:3.13.2' + dependency 'org.assertj:assertj-core:3.14.0' dependency 'org.awaitility:awaitility:4.0.1' @@ -78,29 +79,29 @@ dependencyManagement { dependency 'org.java-websocket:Java-WebSocket:1.4.0' - dependency 'org.jupnp:org.jupnp:2.5.2' dependency 'org.jupnp:org.jupnp.support:2.5.2' + dependency 'org.jupnp:org.jupnp:2.5.2' - dependency 'org.mockito:mockito-core:3.1.0' + dependency 'org.mockito:mockito-core:3.2.4' - dependency 'org.openjdk.jmh:jmh-core:1.21' - dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.21' + dependency 'org.openjdk.jmh:jmh-core:1.22' + dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.22' - dependency 'org.rocksdb:rocksdbjni:6.2.4' + dependency 'org.rocksdb:rocksdbjni:6.4.6' dependency 'org.slf4j:slf4j-log4j12:1.7.26' - dependency 'org.springframework.security:spring-security-crypto:5.2.0.RELEASE' + dependency 'org.springframework.security:spring-security-crypto:5.2.1.RELEASE' - dependency 'org.web3j:abi:4.5.8' - dependency 'org.web3j:core:4.5.8' - dependency 'org.web3j:crypto:4.5.8' - dependency 'org.web3j:besu:4.5.8' + dependency 'org.web3j:abi:4.5.11' + dependency 'org.web3j:besu:4.5.11' + dependency 'org.web3j:core:4.5.11' + dependency 'org.web3j:crypto:4.5.11' dependency 'org.xerial.snappy:snappy-java:1.1.7.3' - dependency "tech.pegasys.ethsigner.internal:core:0.4.0" - dependency "tech.pegasys.ethsigner.internal:file-based:0.4.0" - dependency "tech.pegasys.ethsigner.internal:signing-api:0.4.0" + dependency 'tech.pegasys.ethsigner.internal:core:0.4.0' + dependency 'tech.pegasys.ethsigner.internal:file-based:0.4.0' + dependency 'tech.pegasys.ethsigner.internal:signing-api:0.4.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c9efb68211..8979bb2239 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip diff --git a/metrics/core/build.gradle b/metrics/core/build.gradle index 2d412f59ba..846e98d0a8 100644 --- a/metrics/core/build.gradle +++ b/metrics/core/build.gradle @@ -50,10 +50,11 @@ dependencies { // test dependencies. testImplementation project(':util') + + testImplementation 'com.squareup.okhttp3:okhttp' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' - testImplementation 'com.squareup.okhttp3:okhttp' testSupportImplementation 'org.mockito:mockito-core' } diff --git a/plugins/rocksdb/build.gradle b/plugins/rocksdb/build.gradle index e0df1ddcb2..08d857f451 100644 --- a/plugins/rocksdb/build.gradle +++ b/plugins/rocksdb/build.gradle @@ -40,10 +40,10 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.google.guava:guava' - implementation 'org.apache.tuweni:tuweni-bytes' implementation 'info.picocli:picocli' implementation 'io.prometheus:simpleclient' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.rocksdb:rocksdbjni' runtime 'org.apache.logging.log4j:log4j-core' diff --git a/services/kvstore/build.gradle b/services/kvstore/build.gradle index ecf804415f..121fca1363 100644 --- a/services/kvstore/build.gradle +++ b/services/kvstore/build.gradle @@ -34,10 +34,10 @@ dependencies { implementation project(':metrics:core') implementation project(':metrics:rocksdb') - implementation 'org.apache.tuweni:tuweni-bytes' implementation 'com.google.guava:guava' implementation 'io.prometheus:simpleclient' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' implementation 'org.rocksdb:rocksdbjni' runtime 'org.apache.logging.log4j:log4j-core' @@ -45,6 +45,6 @@ dependencies { testImplementation project(':testutil') testImplementation 'junit:junit' - testImplementation 'org.mockito:mockito-core' testImplementation 'org.assertj:assertj-core' + testImplementation 'org.mockito:mockito-core' } diff --git a/services/pipeline/build.gradle b/services/pipeline/build.gradle index 8da2804e68..002a3b6cdb 100644 --- a/services/pipeline/build.gradle +++ b/services/pipeline/build.gradle @@ -29,11 +29,12 @@ jar { dependencies { api project(':util') + implementation project(':metrics:core') implementation project(':plugin-api') - implementation 'org.apache.logging.log4j:log4j-api' implementation 'com.google.guava:guava' + implementation 'org.apache.logging.log4j:log4j-api' runtime 'org.apache.logging.log4j:log4j-core' diff --git a/services/tasks/build.gradle b/services/tasks/build.gradle index 840c33d88d..6cb1407c3d 100644 --- a/services/tasks/build.gradle +++ b/services/tasks/build.gradle @@ -35,10 +35,10 @@ dependencies { implementation project(':metrics:core') - implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' implementation 'org.apache.logging.log4j:log4j-api' - implementation 'com.google.guava:guava' + implementation 'org.apache.tuweni:tuweni-bytes' runtime 'org.apache.logging.log4j:log4j-core' diff --git a/testutil/build.gradle b/testutil/build.gradle index 3eeca7fa41..8dffe2072c 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -36,10 +36,10 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp' implementation 'junit:junit' implementation 'net.consensys:orion' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-io' + implementation 'org.apache.tuweni:tuweni-toml' implementation 'org.assertj:assertj-core' implementation 'org.mockito:mockito-core' implementation 'org.web3j:core' - implementation 'org.apache.tuweni:tuweni-toml' - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-io' } diff --git a/util/build.gradle b/util/build.gradle index c2977fcb52..8a386f2a4a 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -29,12 +29,12 @@ jar { dependencies { implementation project(':plugin-api') - implementation 'org.apache.tuweni:tuweni-bytes' - implementation 'org.apache.tuweni:tuweni-units' implementation 'com.google.guava:guava' implementation 'io.vertx:vertx-core' implementation 'org.apache.logging.log4j:log4j-api' + implementation 'org.apache.tuweni:tuweni-bytes' + implementation 'org.apache.tuweni:tuweni-units' runtime 'org.apache.logging.log4j:log4j-core'