From 4a698f8c0908257c47259517740fbf450bef0465 Mon Sep 17 00:00:00 2001 From: Igor Artamonov Date: Thu, 21 May 2020 20:48:33 -0400 Subject: [PATCH] solution: update libs to the latest --- build.gradle | 24 ++++++++----------- gradle.properties | 13 ++++------ .../dshackle/upstream/AbstractHead.kt | 2 +- .../upstream/CurrentMultistreamHolder.kt | 2 +- .../dshackle/upstream/DefaultUpstream.kt | 2 +- .../upstream/ethereum/EthereumWsFactory.kt | 5 +--- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 2ec4366d..f16e3362 100644 --- a/build.gradle +++ b/build.gradle @@ -58,25 +58,24 @@ dependencies { implementation "io.grpc:grpc-stub:${grpcVersion}" implementation "io.grpc:grpc-netty:${grpcVersion}" implementation "io.netty:netty-tcnative-boringssl-static:2.0.29.Final" - implementation "io.netty:netty-all:4.1.48.Final" + implementation "io.netty:netty-handler:$nettyVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation "org.springframework:spring-core:$springVersion" - implementation "org.springframework:spring-context:$springVersion" - implementation "org.springframework.security:spring-security-core:$springVersion" - implementation "org.springframework.security:spring-security-web:$springVersion" - implementation "org.springframework.security:spring-security-config:$springVersion" + implementation("org.springframework.boot:spring-boot-starter:$springBootVersion") { + exclude module: 'spring-boot-starter-logging' + } + implementation "org.springframework.security:spring-security-core:$springSecurtyVersion" + implementation "org.springframework.security:spring-security-web:$springSecurtyVersion" + implementation "org.springframework.security:spring-security-config:$springSecurtyVersion" implementation "io.projectreactor:reactor-core:$reactorVersion" - implementation "io.projectreactor.netty:reactor-netty:0.9.5.RELEASE" - implementation 'io.projectreactor.addons:reactor-extra:3.2.3.RELEASE' + implementation "io.projectreactor.netty:reactor-netty:0.9.7.RELEASE" + implementation 'io.projectreactor.addons:reactor-extra:3.3.3.RELEASE' implementation 'io.projectreactor.kotlin:reactor-kotlin-extensions:1.0.2.RELEASE' implementation 'com.salesforce.servicelibs:reactor-grpc:0.10.0' implementation 'io.lettuce:lettuce-core:5.2.2.RELEASE' - implementation 'org.yaml:snakeyaml:1.24' - implementation "io.infinitape:etherjar-domain:$etherjarVersion" implementation "io.infinitape:etherjar-hex:$etherjarVersion" implementation "io.infinitape:etherjar-rpc-http:$etherjarVersion" @@ -84,6 +83,7 @@ dependencies { implementation "io.infinitape:etherjar-tx:$etherjarVersion" implementation 'org.bitcoinj:bitcoinj-core:0.15.8' + implementation 'org.yaml:snakeyaml:1.24' implementation 'org.apache.httpcomponents:httpmime:4.5.8' implementation 'org.apache.httpcomponents:httpclient:4.5.8' implementation 'com.fasterxml.jackson.core:jackson-core:2.9.8' @@ -94,10 +94,6 @@ dependencies { implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'org.bouncycastle:bcprov-jdk15on:1.61' - implementation("org.springframework.boot:spring-boot-starter:$springBootVersion") { - exclude module: 'spring-boot-starter-logging' - } - implementation "org.slf4j:slf4j-api:$slf4jVersion" implementation "org.apache.logging.log4j:log4j-slf4j-impl:2.11.1" implementation "org.slf4j:jul-to-slf4j:$slf4jVersion" diff --git a/gradle.properties b/gradle.properties index 8a4a6d9c..587451be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,21 +2,18 @@ groovyVersion=2.5.5 kotlinVersion=1.3.11 protocVersion=3.7.1 - # Main Libs slf4jVersion=1.7.25 -jacksonVersion=2.9.8 +jacksonVersion=2.11.0 grpcVersion=1.20.0 protobufVersion=3.7.1 - -# Core -springBootVersion=2.1.4.RELEASE -springVersion=5.1.4.RELEASE +springBootVersion=2.1.14.RELEASE +springVersion=5.2.6.RELEASE +springSecurtyVersion=5.3.2.RELEASE reactorVersion=3.3.5.RELEASE - +nettyVersion=4.1.49.Final # Our Libs etherjarVersion=0.9.1 - # Testing spockVersion=1.3-groovy-2.5 diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt index 1aceaf83..0cdf0970 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory import reactor.core.Disposable import reactor.core.publisher.Flux import reactor.core.publisher.Mono -import reactor.core.publisher.TopicProcessor +import reactor.extra.processor.TopicProcessor import java.util.concurrent.atomic.AtomicReference abstract class AbstractHead : Head { diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt index d8ffaed1..b8092850 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt @@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.scheduling.annotation.Scheduled import org.springframework.stereotype.Repository import reactor.core.publisher.Flux -import reactor.core.publisher.TopicProcessor +import reactor.extra.processor.TopicProcessor import java.util.* import java.util.concurrent.Callable import java.util.concurrent.ConcurrentHashMap diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/DefaultUpstream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/DefaultUpstream.kt index 7a223b45..62f2b4ac 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/DefaultUpstream.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/DefaultUpstream.kt @@ -19,7 +19,7 @@ package io.emeraldpay.dshackle.upstream import io.emeraldpay.dshackle.config.UpstreamsConfig import io.emeraldpay.dshackle.upstream.calls.CallMethods import reactor.core.publisher.Flux -import reactor.core.publisher.TopicProcessor +import reactor.extra.processor.TopicProcessor import java.util.concurrent.atomic.AtomicReference abstract class DefaultUpstream( diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsFactory.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsFactory.kt index 295fbd56..eaf4e5aa 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsFactory.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumWsFactory.kt @@ -16,13 +16,10 @@ */ package io.emeraldpay.dshackle.upstream.ethereum -import com.fasterxml.jackson.databind.ObjectMapper import io.emeraldpay.dshackle.Defaults -import io.emeraldpay.dshackle.Global import io.emeraldpay.dshackle.SilentException import io.emeraldpay.dshackle.config.AuthConfig import io.emeraldpay.dshackle.data.BlockContainer -import io.emeraldpay.dshackle.data.BlockId import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcRequest import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcResponse import io.infinitape.etherjar.rpc.json.BlockJson @@ -31,7 +28,7 @@ import io.infinitape.etherjar.rpc.ws.WebsocketClient import org.slf4j.LoggerFactory import reactor.core.publisher.Flux import reactor.core.publisher.Mono -import reactor.core.publisher.TopicProcessor +import reactor.extra.processor.TopicProcessor import reactor.retry.Repeat import java.net.URI import java.time.Duration