Update dependencies (#112)

Upgrade dependencies except rocksdb (needs burn in testing),
picocli (reorders options), gradle (causes build server breakage), and
web3j (test failures).

* Awaitality removed a Duration object and instead uses java.time
* jackson stopped throwing a checked exception for one API
* spotless now enforces gradle formatting checks (yea!)

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
pull/117/head
Danno Ferrin 5 years ago committed by GitHub
parent 8154874f05
commit e9b2dd24c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      acceptance-tests/tests/build.gradle
  2. 4
      build.gradle
  3. 4
      ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java
  4. 4
      ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java
  5. 13
      ethereum/referencetests/build.gradle
  6. 53
      gradle/versions.gradle

@ -38,7 +38,11 @@ dependencies {
test.enabled = false
sourceSets {
test { resources { srcDirs "${rootDir}/besu/build/libs" } }
test {
resources {
srcDirs "${rootDir}/besu/build/libs"
}
}
}
processTestResources.dependsOn(':besu:testJar')

@ -18,9 +18,9 @@ import net.ltgt.gradle.errorprone.CheckSeverity
import java.text.SimpleDateFormat
plugins {
id 'com.diffplug.gradle.spotless' version '3.23.1'
id 'com.diffplug.gradle.spotless' version '3.25.0'
id 'com.jfrog.bintray' version '1.8.4'
id 'com.github.ben-manes.versions' version '0.21.0'
id 'com.github.ben-manes.versions' version '0.26.0'
id 'com.github.hierynomus.license' version '0.15.0'
id 'io.spring.dependency-management' version '1.0.8.RELEASE'
id 'me.champeau.gradle.jmh' version '0.4.8' apply false

@ -16,8 +16,6 @@ package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Optional;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -74,8 +72,6 @@ public class JsonRpcParameter {
param = mapper.readValue(json, paramClass);
} catch (final JsonProcessingException e) {
throw new InvalidJsonRpcParameters("Invalid json rpc parameter at index " + index, e);
} catch (final IOException e) {
throw new UncheckedIOException(e);
}
}

@ -28,6 +28,7 @@ import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.Di
import java.io.Closeable;
import java.io.IOException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@ -42,13 +43,12 @@ import io.vertx.core.Vertx;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.awaitility.core.ConditionTimeoutException;
public class TestNodeList implements Closeable {
private static final Logger LOG = LogManager.getLogger();
protected final List<TestNode> nodes = new ArrayList<>();
private final Duration MSG_WAIT = new Duration(2, TimeUnit.SECONDS);
private final Duration MSG_WAIT = Duration.ofSeconds(2);
public TestNode create(
final Vertx vertx,

@ -13,11 +13,18 @@
* SPDX-License-Identifier: Apache-2.0
*/
spotless { groovyGradle { paddedCell()
} }
spotless {
groovyGradle {
paddedCell()
}
}
sourceSets {
test { resources { include '*Tests/**/*.json' } }
test {
resources {
include '*Tests/**/*.json'
}
}
}
configurations { testOutput }

@ -15,25 +15,24 @@
dependencyManagement {
dependencies {
dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.9.1'
dependency 'com.fasterxml.jackson.core:jackson-databind:2.10.0'
dependency 'com.github.docker-java:docker-java:3.0.14'
dependency 'com.github.tomakehurst:wiremock-jre8:2.24.1'
dependency 'com.github.tomakehurst:wiremock-jre8:2.25.0'
dependency 'com.google.auto.service:auto-service:1.0-rc5'
dependency 'com.google.auto.service:auto-service:1.0-rc6'
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.graphql-java:graphql-java:13.0'
dependency 'com.google.guava:guava:28.1-jre'
dependency 'com.google.guava:guava:28.0-jre'
dependency 'com.google.auto.service:auto-service:1.0-rc4'
dependency 'com.graphql-java:graphql-java:13.0'
dependency 'com.squareup.okhttp3:okhttp:3.14.2'
dependency 'com.squareup.okhttp3:okhttp:4.2.2'
dependency 'commons-cli:commons-cli:1.4'
@ -41,12 +40,12 @@ dependencyManagement {
dependency 'io.pkts:pkts-core:3.0.5'
dependency 'io.prometheus:simpleclient:0.6.0'
dependency 'io.prometheus:simpleclient_common:0.6.0'
dependency 'io.prometheus:simpleclient_hotspot:0.6.0'
dependency 'io.prometheus:simpleclient_pushgateway:0.6.0'
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.reactivex.rxjava2:rxjava:2.2.10'
dependency 'io.reactivex.rxjava2:rxjava:2.2.13'
dependency 'io.vertx:vertx-auth-jwt:3.8.0'
dependency 'io.vertx:vertx-codegen:3.8.0'
@ -56,34 +55,32 @@ dependencyManagement {
dependency 'junit:junit:4.12'
dependencySet(group: 'org.apache.tuweni', version: '0.9.0-20190709195335') {
entry 'tuweni-bytes'
entry 'tuweni-io'
entry 'tuweni-config'
entry 'tuweni-crypto'
entry 'tuweni-toml'
}
dependency 'org.apache.tuweni:tuweni-bytes:0.9.0-20190709195335'
dependency 'org.apache.tuweni:tuweni-io:0.9.0-20190709195335'
dependency 'org.apache.tuweni:tuweni-config:0.9.0-20190709195335'
dependency 'org.apache.tuweni:tuweni-crypto:0.9.0-20190709195335'
dependency 'org.apache.tuweni:tuweni-toml:0.9.0-20190709195335'
dependency 'net.consensys:orion:1.3.2'
dependency 'org.apache.commons:commons-text:1.7'
dependency 'org.apache.commons:commons-text:1.8'
dependency 'org.apache.logging.log4j:log4j-api:2.12.0'
dependency 'org.apache.logging.log4j:log4j-core:2.12.0'
dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.0'
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.12.2'
dependency 'org.assertj:assertj-core:3.13.2'
dependency 'org.awaitility:awaitility:3.1.6'
dependency 'org.awaitility:awaitility:4.0.1'
dependency 'org.bouncycastle:bcprov-jdk15on:1.62'
dependency 'org.bouncycastle:bcprov-jdk15on:1.64'
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.mockito:mockito-core:2.28.2'
dependency 'org.mockito:mockito-core:3.1.0'
dependency 'org.openjdk.jmh:jmh-core:1.21'
dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
@ -92,7 +89,7 @@ dependencyManagement {
dependency 'org.slf4j:slf4j-log4j12:1.7.26'
dependency 'org.springframework.security:spring-security-crypto:5.1.5.RELEASE'
dependency 'org.springframework.security:spring-security-crypto:5.2.0.RELEASE'
dependency 'org.web3j:abi:4.5.1'
dependency 'org.web3j:core:4.5.1'

Loading…
Cancel
Save