Upgrade versions and build cleanup (#738)

* upgread all dependencies and gradle plugins
* did not upgrade net.researchgate.release gradle plugin as that is know to break correto JVM
* removed quickstart from module list.  It's been gone a while now.
* sorted the modules
Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
pull/2/head
Danno Ferrin 6 years ago committed by GitHub
parent ef2aaac9ed
commit 00f0dbfb13
  1. 2
      errorprone-checks/build.gradle
  2. 26
      gradle/versions.gradle
  3. 17
      settings.gradle

@ -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

@ -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'
@ -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'
@ -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'
}
}

@ -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'

Loading…
Cancel
Save