CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dependencies Version upgrade (#303)

Browse Source 
Upgrade dependency versions

* All version information is merged into one place
* Upgrade most version to their latest non-test version.
* dependencies are now sorted

Two dependencies were not upgraded:

errorprone - There are new checks that require build or source changes.
vertex - The license to eclipse 2.0 which is not in our current approved license list. 
    The change is trivial but for tracability it should be done alone.

Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
pull/2/head
Danno Ferrin 6 years ago committed by GitHub
parent 6a8d5bbfb9
commit d4fff610c6
20 changed files with 127 additions and 132 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      acceptance-tests/build.gradle
  2. 21
      build.gradle
  3. 4
      config/build.gradle
  4. 12
      consensus/clique/build.gradle
  5. 2
      consensus/common/build.gradle
  6. 13
      consensus/ibft/build.gradle
  7. 15
      consensus/ibftlegacy/build.gradle
  8. 16
      errorprone-checks/build.gradle
  9. 9
      ethereum/blockcreation/build.gradle
  10. 16
      ethereum/core/build.gradle
  11. 4
      ethereum/eth/build.gradle
  12. 6
      ethereum/jsonrpc/build.gradle
  13. 16
      ethereum/p2p/build.gradle
  14. 2
      ethereum/rlp/build.gradle
  15. 2
      ethereum/trie/build.gradle
  16. 66
      gradle/versions.gradle
  17. 17
      pantheon/build.gradle
  18. 9
      quickstart/build.gradle
  19. 4
      services/kvstore/build.gradle
  20. 17
      versions.gradle

8
acceptance-tests/build.gradle
Unescape View File

@ -23,15 +23,15 @@ dependencies {
testImplementation project(':ethereum:jsonrpc')
testImplementation project(':pantheon')
testImplementation project(':util')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation 'junit:junit'
testImplementation 'org.awaitility:awaitility'
testImplementation 'com.google.guava:guava'
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'io.vertx:vertx-core'
testImplementation 'junit:junit'
testImplementation 'org.apache.logging.log4j:log4j-api'
testImplementation 'org.assertj:assertj-core'
testImplementation 'com.google.guava:guava'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.web3j:core'
}

21
build.gradle
Unescape View File

@ -14,17 +14,16 @@
import net.ltgt.gradle.errorprone.CheckSeverity
plugins {
id 'com.diffplug.gradle.spotless' version '3.13.0'
id 'io.spring.dependency-management' version '1.0.4.RELEASE'
id 'com.github.hierynomus.license' version '0.14.0'
id 'net.ltgt.errorprone' version '0.6'
id 'me.champeau.gradle.jmh' version '0.4.5' apply false
id 'com.diffplug.gradle.spotless' version '3.16.0'
id 'com.jfrog.bintray' version '1.8.4'
id 'net.researchgate.release' version '2.6.0'
id 'com.github.ben-manes.versions' version '0.20.0'
id 'com.github.hierynomus.license' version '0.15.0'
id 'io.spring.dependency-management' version '1.0.6.RELEASE'
id 'me.champeau.gradle.jmh' version '0.4.7' apply false
id 'net.ltgt.errorprone' version '0.6'
id 'net.researchgate.release' version '2.7.0'
}
apply from: './versions.gradle'
group = 'tech.pegasys.pantheon'
defaultTasks 'build', 'checkLicenses', 'javadoc'
@ -89,9 +88,9 @@ allprojects {
}
dependencies {
errorprone("com.google.errorprone:error_prone_core:$errorproneCore")
errorprone("com.google.errorprone:error_prone_core")
if (JavaVersion.current().isJava8()) {
errorproneJavac("com.google.errorprone:javac:$errorproneJavac")
errorproneJavac("com.google.errorprone:javac")
}
}
@ -331,7 +330,7 @@ startScripts {
dependencies {
compile project(':pantheon')
errorprone 'com.google.errorprone:error_prone_core:2.3.1'
errorprone 'com.google.errorprone:error_prone_core'
}
distributions {

4
config/build.gradle
Unescape View File

@ -27,17 +27,17 @@ jar {
dependencies {
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'io.vertx:vertx-core'
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.logging.log4j:log4j-api'
runtime 'org.apache.logging.log4j:log4j-core'
testImplementation project(':testutil')
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
testImplementation 'junit:junit'
}
configurations { testArtifacts }

12
consensus/clique/build.gradle
Unescape View File

@ -29,6 +29,7 @@ repositories { mavenCentral() }
dependencies {
implementation project(':config')
implementation project(':consensus:common')
implementation project(':crypto')
implementation project(':ethereum:core')
implementation project(':ethereum:blockcreation')
@ -38,13 +39,14 @@ dependencies {
implementation project(':ethereum:p2p')
implementation project(':services:kvstore')
implementation project(':consensus:common')
implementation project(':util')
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.google.guava:guava'
implementation project(':util')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation "org.assertj:assertj-core:3.10.0"
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
}

2
consensus/common/build.gradle
Unescape View File

@ -28,10 +28,12 @@ jar {
dependencies {
implementation project(':ethereum:core')
implementation project(':util')
implementation 'com.google.guava:guava'
testImplementation project(':crypto')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation 'junit:junit'
testImplementation "org.assertj:assertj-core"
testImplementation 'org.mockito:mockito-core'

13
consensus/ibft/build.gradle
Unescape View File

@ -29,23 +29,22 @@ dependencies {
implementation project(':config')
implementation project(':consensus:common')
implementation project(':crypto')
implementation project(':ethereum:core')
implementation project(':ethereum:blockcreation')
implementation project(':ethereum:core')
implementation project(':ethereum:eth')
implementation project(':ethereum:jsonrpc')
implementation project(':ethereum:rlp')
implementation project(':ethereum:p2p')
implementation project(':services:kvstore')
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'com.google.guava:guava'
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation "org.awaitility:awaitility:3.1.2"
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation "org.assertj:assertj-core:3.10.0"
testImplementation 'junit:junit'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
}

15
consensus/ibftlegacy/build.gradle
Unescape View File

@ -13,12 +13,12 @@ jar {
}
dependencies {
implementation project(':config')
implementation project(':consensus:common')
implementation project(':consensus:ibft')
implementation project(':config')
implementation project(':crypto')
implementation project(':ethereum:core')
implementation project(':ethereum:blockcreation')
implementation project(':ethereum:core')
implementation project(':ethereum:eth')
implementation project(':ethereum:jsonrpc')
implementation project(':ethereum:rlp')
@ -28,12 +28,11 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project( path: ':consensus:ibft', configuration: 'testSupportArtifacts')
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation "org.awaitility:awaitility:3.1.2"
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(path: ':consensus:ibft', configuration: 'testSupportArtifacts')
testImplementation "org.assertj:assertj-core:3.10.0"
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.mockito:mockito-core'
}

16
errorprone-checks/build.gradle
Unescape View File

@ -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.14' apply false }
plugins { id 'net.ltgt.apt' version '0.19' 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
@ -29,17 +29,17 @@ targetCompatibility = 1.8
dependencies {
implementation "com.google.errorprone:error_prone_core"
implementation "com.google.errorprone:error_prone_annotation"
implementation 'com.google.errorprone:error_prone_annotation'
implementation 'com.google.errorprone:error_prone_core'
implementation 'com.google.auto.service:auto-service'
implementation "com.google.auto.service:auto-service:1.0-rc4"
annotationProcessor "com.google.auto.service:auto-service:1.0-rc4"
annotationProcessor 'com.google.auto.service:auto-service'
testImplementation "junit:junit"
testImplementation "org.assertj:assertj-core"
testImplementation 'com.google.errorprone:error_prone_test_helpers'
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
epJavac "com.google.errorprone:error_prone_check_api"
epJavac 'com.google.errorprone:error_prone_check_api'
}
test {

9
ethereum/blockcreation/build.gradle
Unescape View File

@ -20,14 +20,15 @@ dependencies {
implementation project(':crypto')
implementation project(':services:kvstore')
implementation 'io.vertx:vertx-core'
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.mockito:mockito-core'
testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
}

16
ethereum/core/build.gradle
Unescape View File

@ -39,33 +39,35 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-core'
testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
testImplementation project(path:':ethereum:referencetests', configuration: 'testOutput')
testImplementation project( path: ':config', configuration: 'testSupportArtifacts')
testImplementation project(':testutil')
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
testImplementation 'junit:junit'
integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
integrationTestImplementation 'junit:junit'
integrationTestImplementation 'org.assertj:assertj-core'
integrationTestImplementation 'org.mockito:mockito-core'
integrationTestImplementation 'junit:junit'
testSupportImplementation project(path: ':config', configuration: 'testSupportArtifacts')
testSupportImplementation project(':testutil')
testSupportImplementation project( path: ':config', configuration: 'testSupportArtifacts')
testSupportImplementation 'junit:junit'
testSupportImplementation 'org.assertj:assertj-core'
testSupportImplementation 'org.mockito:mockito-core'
testSupportImplementation 'junit:junit'
jmhImplementation project(':util')
jmhImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
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(':services:kvstore')
jmhImplementation project(':util')
jmhImplementation 'com.google.guava:guava'
jmhImplementation 'org.openjdk.jmh:jmh-generator-annprocess'
}

4
ethereum/eth/build.gradle
Unescape View File

@ -36,8 +36,8 @@ dependencies {
testImplementation project(':config')
testImplementation project(':crypto')
testImplementation project( path: ':ethereum:core', configuration: 'testArtifacts')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(':ethereum:mock-p2p')
testImplementation project(':testutil')

6
ethereum/jsonrpc/build.gradle
Unescape View File

@ -27,8 +27,8 @@ jar {
dependencies {
implementation project(':crypto')
implementation project(':ethereum:core')
implementation project(':ethereum:blockcreation')
implementation project(':ethereum:core')
implementation project(':ethereum:eth')
implementation project(':ethereum:p2p')
implementation project(':ethereum:rlp')
@ -37,10 +37,10 @@ dependencies {
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
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')

16
ethereum/p2p/build.gradle
Unescape View File

@ -27,8 +27,8 @@ jar {
dependencies {
implementation project(':crypto')
implementation project(':ethereum:rlp')
implementation project(':ethereum:core')
implementation project(':ethereum:rlp')
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
@ -38,18 +38,18 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-core'
// test dependencies.
testImplementation project (path: ':ethereum:core', configuration: 'testArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
testImplementation project(':testutil')
testImplementation 'junit:junit'
testImplementation('io.pkts:pkts-core') {
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 "org.mockito:mockito-core"
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.mockito:mockito-core'
testImplementation('io.pkts:pkts-core') {
exclude group: 'io.pkts', module: 'pkts-sdp'
exclude group: 'io.pkts', module: 'pkts-sip'
}
}

2
ethereum/rlp/build.gradle
Unescape View File

@ -35,8 +35,8 @@ dependencies {
jmh project(':util')
testImplementation project(':testutil')
testImplementation project(path:':ethereum:referencetests', configuration: 'testOutput')
testImplementation project(':testutil')
testImplementation 'org.assertj:assertj-core'
testImplementation 'com.fasterxml.jackson.core:jackson-databind'

2
ethereum/trie/build.gradle
Unescape View File

@ -38,8 +38,8 @@ dependencies {
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
testImplementation 'junit:junit'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
}
test { exclude 'tech/pegasys/pantheon/ethereum/trie/TrieRefTest.class' }

66
gradle/versions.gradle
Unescape View File

@ -13,48 +13,56 @@
dependencyManagement {
dependencies {
dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
dependency('com.google.guava:guava:23.6-jre')
dependency('commons-cli:commons-cli:1.4')
dependency 'com.github.docker-java:docker-java:3.0.14'
dependency('org.apache.logging.log4j:log4j-api:2.10.0')
dependency('org.apache.logging.log4j:log4j-core:2.10.0')
dependency('org.apache.logging.log4j:log4j-slf4j-impl:2.10.0')
dependency 'com.google.auto.service:auto-service:1.0-rc4'
dependency('org.bouncycastle:bcprov-jdk15on:1.58')
dependency 'com.google.errorprone:javac:9+181-r4173-1'
dependency 'com.google.errorprone:error_prone_check_api:2.3.1'
dependency 'com.google.errorprone:error_prone_core:2.3.1'
dependency 'com.google.errorprone:error_prone_annotation:2.3.1'
dependency 'com.google.errorprone:error_prone_test_helpers:2.3.1'
dependency('junit:junit:4.12')
dependency('io.vertx:vertx-core:3.5.0')
dependency('io.vertx:vertx-unit:3.5.0')
dependency('io.vertx:vertx-web:3.5.0')
dependency('io.vertx:vertx-codegen:3.5.0')
dependency 'com.google.guava:guava:27.0.1-jre'
dependency('org.assertj:assertj-core:3.9.0')
dependency 'com.squareup.okhttp3:okhttp:3.12.0'
dependency('org.mockito:mockito-core:2.21.0')
dependency 'commons-cli:commons-cli:1.4'
dependency('com.fasterxml.jackson.core:jackson-databind:2.9.7')
dependency 'info.picocli:picocli:3.8.0'
dependency('com.squareup.okhttp3:okhttp:3.9.1')
dependency 'io.pkts:pkts-core:3.0.3'
dependency('org.awaitility:awaitility:3.0.0')
dependency 'io.vertx:vertx-codegen:3.5.0'
dependency 'io.vertx:vertx-core:3.5.0'
dependency 'io.vertx:vertx-unit:3.5.0'
dependency 'io.vertx:vertx-web:3.5.0'
dependency('io.pkts:pkts-core:3.0.2')
dependency 'junit:junit:4.12'
dependency('org.xerial.snappy:snappy-java:1.1.7.2')
dependency 'net.consensys.cava:cava-toml:0.4.0'
dependency('com.github.docker-java:docker-java:3.0.14')
dependency 'org.apache.logging.log4j:log4j-api:2.11.1'
dependency 'org.apache.logging.log4j:log4j-core:2.11.1'
dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
dependency('info.picocli:picocli:3.8.0')
dependency('net.consensys.cava:cava-toml:0.3.1')
dependency 'org.assertj:assertj-core:3.11.1'
dependency('org.openjdk.jmh:jmh-core:1.21')
dependency('org.openjdk.jmh:jmh-generator-annprocess:1.21')
dependency 'org.awaitility:awaitility:3.1.3'
dependency('org.web3j:core:4.0.1')
dependency("com.google.errorprone:error_prone_check_api:2.3.1")
dependency("com.google.errorprone:error_prone_core:2.3.1")
dependency("com.google.errorprone:error_prone_annotation:2.3.1")
dependency("com.google.errorprone:error_prone_test_helpers:2.3.1")
dependency 'org.bouncycastle:bcprov-jdk15on:1.60'
dependency 'org.mockito:mockito-core:2.23.4'
dependency 'org.openjdk.jmh:jmh-core:1.21'
dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
dependency 'org.rocksdb:rocksdbjni:5.15.10'
dependency 'org.web3j:core:4.0.1'
dependency 'org.xerial.snappy:snappy-java:1.1.7.2'
}
}
}

17
pantheon/build.gradle
Unescape View File

@ -32,31 +32,30 @@ dependencies {
implementation project(':consensus:clique')
implementation project(':consensus:ibft')
implementation project(':consensus:ibftlegacy')
implementation project(':consensus:clique')
implementation project(':ethereum:eth')
implementation project(':ethereum:core')
implementation project(':ethereum:blockcreation')
implementation project(':ethereum:rlp')
implementation project(':ethereum:p2p')
implementation project(':ethereum:core')
implementation project(':ethereum:eth')
implementation project(':ethereum:jsonrpc')
implementation project(':ethereum:p2p')
implementation project(':ethereum:rlp')
implementation project(':services:kvstore')
implementation 'com.google.guava:guava'
implementation('info.picocli:picocli')
implementation 'net.consensys.cava:cava-toml'
implementation 'info.picocli:picocli'
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
implementation 'net.consensys.cava:cava-toml'
implementation 'org.apache.logging.log4j:log4j-api'
runtime 'org.apache.logging.log4j:log4j-core'
testImplementation project(':testutil')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'junit:junit'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.mockito:mockito-core'
}

9
quickstart/build.gradle
Unescape View File

@ -15,13 +15,14 @@ dependencies {
testRuntime 'org.apache.logging.log4j:log4j-core'
testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl'
testImplementation project(':pantheon')
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'io.vertx:vertx-core'
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.web3j:core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'io.vertx:vertx-core'
testImplementation project( path: ':pantheon')
testImplementation 'org.web3j:core'
}
test.enabled = false

4
services/kvstore/build.gradle
Unescape View File

@ -28,9 +28,9 @@ jar {
dependencies {
api project(':util')
implementation 'com.google.guava:guava'
implementation group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'com.google.guava:guava'
implementation 'org.rocksdb:rocksdbjni'
runtime 'org.apache.logging.log4j:log4j-core'

17
versions.gradle
Unescape View File

@ -1,17 +0,0 @@
/*
* Copyright 2018 ConsenSys AG.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
ext {
errorproneCore='2.3.1'
errorproneJavac='9+181-r4173-1'
}
Write Preview
Loading…
Cancel
Save