Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Upgrade dependency versions and build cleanup #738

Merged
merged 2 commits into from
Feb 1, 2019
Merged

Upgrade dependency versions and build cleanup #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b759d89
Upgrade versions and build cleanup
shemnon Feb 1, 2019
4c20f4f
Merge branch 'master' into build_tweaks
shemnon Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion errorprone-checks/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

// See https://github.com/tbroyer/gradle-errorprone-plugin
// See https://github.com/tbroyer/gradle-apt-plugin
plugins { id 'net.ltgt.apt' version '0.19' apply false }
plugins { id 'net.ltgt.apt' version '0.20' apply false }

// we use this config to get the path of the JDK 9 javac jar, to
// stick it in the bootclasspath when running tests
Expand Down
26 changes: 13 additions & 13 deletions gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,28 @@ dependencyManagement {

dependency 'commons-cli:commons-cli:1.4'

dependency 'info.picocli:picocli:3.9.1'
dependency 'info.picocli:picocli:3.9.2'

dependency 'io.pkts:pkts-core:3.0.3'
dependency 'io.pkts:pkts-core:3.0.4'

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.reactivex.rxjava2:rxjava:2.2.5'
dependency 'io.reactivex.rxjava2:rxjava:2.2.6'

dependency 'io.vertx:vertx-codegen:3.6.2'
dependency 'io.vertx:vertx-core:3.6.2'
dependency 'io.vertx:vertx-unit:3.6.2'
dependency 'io.vertx:vertx-web:3.6.2'
dependency 'io.vertx:vertx-codegen:3.6.3'
dependency 'io.vertx:vertx-core:3.6.3'
dependency 'io.vertx:vertx-unit:3.6.3'
dependency 'io.vertx:vertx-web:3.6.3'

dependency 'junit:junit:4.12'

dependency 'net.consensys.cava:cava-toml:0.5.0'

dependency 'net.consensys:orion:0.1.1'

dependency 'org.apache.commons:commons-text:1.6'

dependency 'org.apache.logging.log4j:log4j-api:2.11.1'
Expand All @@ -59,7 +61,7 @@ dependencyManagement {

dependency 'org.assertj:assertj-core:3.11.1'

dependency 'org.awaitility:awaitility:3.1.5'
dependency 'org.awaitility:awaitility:3.1.6'

dependency 'org.bouncycastle:bcprov-jdk15on:1.60'

Expand All @@ -74,12 +76,10 @@ dependencyManagement {

dependency 'org.springframework.security:spring-security-crypto:5.1.3.RELEASE'

dependency 'org.web3j:abi:4.1.0'
dependency 'org.web3j:core:4.1.0'
dependency 'org.web3j:crypto:4.1.0'
dependency 'org.web3j:abi:4.1.1'
dependency 'org.web3j:core:4.1.1'
dependency 'org.web3j:crypto:4.1.1'

dependency 'org.xerial.snappy:snappy-java:1.1.7.2'

dependency 'net.consensys:orion:0.1.1'
}
}
17 changes: 8 additions & 9 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,29 @@

rootProject.name='pantheon'
include 'acceptance-tests'
include 'config'
include 'consensus'
include 'consensus:clique'
include 'consensus:common'
include 'consensus:ibft'
include 'consensus:ibftlegacy'
include 'config'
include 'crypto'
include 'ethereum:p2p'
include 'ethereum:mock-p2p'
include 'errorprone-checks'
include 'ethereum:blockcreation'
include 'ethereum:core'
include 'ethereum:eth'
include 'ethereum:jsonrpc'
include 'ethereum:mock-p2p'
include 'ethereum:p2p'
include 'ethereum:permissioning'
include 'ethereum:referencetests'
include 'ethereum:core'
include 'ethereum:blockcreation'
include 'ethereum:rlp'
include 'ethereum:eth'
include 'ethereum:trie'
include 'metrics'
include 'orion'
include 'pantheon'
include 'services:kvstore'
include 'services:queue'
include 'services:util'
include 'testutil'
include 'util'
include 'errorprone-checks'
include 'quickstart'
include 'orion'