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

Upgrade to Apache Tuweni 1.2.0 (#1493)

Browse Source 
* Upgrade to Apache Tuweni 1.2.0

Signed-off-by: Antoine Toulme <antoine@lunar-ocean.com>

* no jsr305

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>

Co-authored-by: Danno Ferrin <danno.ferrin@gmail.com>
pull/1543/head
Antoine Toulme 4 years ago committed by GitHub
parent 88b9c01503
commit b9364ed243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 71 additions and 68 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. 6
      acceptance-tests/dsl/build.gradle
  2. 2
      acceptance-tests/tests/build.gradle
  3. 11
      besu/build.gradle
  4. 2
      config/build.gradle
  5. 4
      consensus/clique/build.gradle
  6. 2
      consensus/common/build.gradle
  7. 4
      consensus/ibft/build.gradle
  8. 4
      consensus/ibftlegacy/build.gradle
  9. 4
      crypto/build.gradle
  10. 3
      enclave/build.gradle
  11. 8
      ethereum/api/build.gradle
  12. 4
      ethereum/blockcreation/build.gradle
  13. 10
      ethereum/core/build.gradle
  14. 4
      ethereum/eth/build.gradle
  15. 2
      ethereum/ethstats/build.gradle
  16. 2
      ethereum/mock-p2p/build.gradle
  17. 4
      ethereum/p2p/build.gradle
  18. 6
      ethereum/permissioning/build.gradle
  19. 1
      ethereum/referencetests/build.gradle
  20. 4
      ethereum/retesteth/build.gradle
  21. 4
      ethereum/rlp/build.gradle
  22. 4
      ethereum/stratum/build.gradle
  23. 4
      ethereum/trie/build.gradle
  24. 14
      gradle/versions.gradle
  25. 4
      plugin-api/build.gradle
  26. 2
      plugins/rocksdb/build.gradle
  27. 6
      privacy-contracts/build.gradle
  28. 2
      services/kvstore/build.gradle
  29. 2
      services/tasks/build.gradle
  30. 6
      testutil/build.gradle
  31. 4
      util/build.gradle

6
acceptance-tests/dsl/build.gradle
Unescape View File

@ -31,9 +31,9 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.logging.log4j:log4j-slf4j-impl'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-io'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:io'
implementation 'org.apache.tuweni:units'
implementation 'org.assertj:assertj-core'
implementation 'org.awaitility:awaitility'
implementation 'org.java-websocket:Java-WebSocket'

2
acceptance-tests/tests/build.gradle
Unescape View File

@ -34,7 +34,7 @@ dependencies {
testImplementation 'junit:junit'
testImplementation 'net.consensys:orion'
testImplementation 'org.apache.commons:commons-compress'
testImplementation 'org.apache.tuweni:tuweni-crypto'
testImplementation 'org.apache.tuweni:crypto'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.web3j:abi'

11
besu/build.gradle
Unescape View File

@ -61,9 +61,10 @@ dependencies {
implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-config'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:config'
implementation 'org.apache.tuweni:toml'
implementation 'org.apache.tuweni:units'
implementation 'org.springframework.security:spring-security-crypto'
implementation 'org.xerial.snappy:snappy-java'
@ -80,8 +81,8 @@ dependencies {
testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'junit:junit'
testImplementation 'org.apache.commons:commons-text'
testImplementation 'org.apache.tuweni:tuweni-bytes'
testImplementation 'org.apache.tuweni:tuweni-units'
testImplementation 'org.apache.tuweni:bytes'
testImplementation 'org.apache.tuweni:units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.mockito:mockito-core'

2
config/build.gradle
Unescape View File

@ -32,7 +32,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'info.picocli:picocli'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
runtimeOnly 'org.apache.logging.log4j:log4j-core'
testImplementation project(':testutil')

4
consensus/clique/build.gradle
Unescape View File

@ -44,8 +44,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')

2
consensus/common/build.gradle
Unescape View File

@ -37,7 +37,7 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
testImplementation project(':crypto')
testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')

4
consensus/ibft/build.gradle
Unescape View File

@ -41,8 +41,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')

4
consensus/ibftlegacy/build.gradle
Unescape View File

@ -28,8 +28,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
testImplementation project(path: ':consensus:ibft', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')

4
crypto/build.gradle
Unescape View File

@ -36,8 +36,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'net.java.dev.jna:jna'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
implementation 'org.hyperledger.besu:secp256k1'
runtimeOnly 'org.apache.logging.log4j:log4j-core'

3
enclave/build.gradle
Unescape View File

@ -3,8 +3,9 @@ dependencies {
api project(':crypto')
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-net'
implementation 'org.apache.tuweni:net'
implementation 'org.apache.logging.log4j:log4j-api'
runtimeOnly('org.bouncycastle:bcpkix-jdk15on')

8
ethereum/api/build.gradle
Unescape View File

@ -54,10 +54,10 @@ dependencies {
implementation 'io.vertx:vertx-unit'
implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-net'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:net'
implementation 'org.apache.tuweni:toml'
implementation 'org.apache.tuweni:units'
implementation 'org.bouncycastle:bcprov-jdk15on'
implementation 'org.springframework.security:spring-security-crypto'
implementation 'org.xerial.snappy:snappy-java'

4
ethereum/blockcreation/build.gradle
Unescape View File

@ -22,8 +22,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')

10
ethereum/core/build.gradle
Unescape View File

@ -44,8 +44,8 @@ dependencies {
implementation 'io.vertx:vertx-core'
implementation 'net.java.dev.jna:jna'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
implementation 'org.hyperledger.besu:bls12-381'
implementation 'org.immutables:value-annotations'
@ -60,9 +60,9 @@ dependencies {
testImplementation 'junit:junit'
testImplementation 'org.apache.logging.log4j:log4j-core'
testImplementation 'org.apache.tuweni:tuweni-bytes'
testImplementation 'org.apache.tuweni:tuweni-io'
testImplementation 'org.apache.tuweni:tuweni-units'
testImplementation 'org.apache.tuweni:bytes'
testImplementation 'org.apache.tuweni:io'
testImplementation 'org.apache.tuweni:units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'

4
ethereum/eth/build.gradle
Unescape View File

@ -42,8 +42,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
annotationProcessor "org.immutables:value"
implementation "org.immutables:value-annotations"

2
ethereum/ethstats/build.gradle
Unescape View File

@ -34,7 +34,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation project(':consensus:clique')
implementation project(':config')

2
ethereum/mock-p2p/build.gradle
Unescape View File

@ -35,7 +35,7 @@ dependencies {
implementation project(':util')
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
testImplementation "junit:junit"
testImplementation 'org.assertj:assertj-core'

4
ethereum/p2p/build.gradle
Unescape View File

@ -38,8 +38,8 @@ dependencies {
implementation 'io.prometheus:simpleclient'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
implementation 'org.xerial.snappy:snappy-java'
annotationProcessor "org.immutables:value"

6
ethereum/permissioning/build.gradle
Unescape View File

@ -36,9 +36,9 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:toml'
implementation 'org.apache.tuweni:units'
implementation 'org.web3j:abi:5.0.0'
testImplementation project(':config')

1
ethereum/referencetests/build.gradle
Unescape View File

@ -32,6 +32,7 @@ dependencies {
implementation project(':services:kvstore')
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.google.guava:guava'
testOutput sourceSets.test.output
}

4
ethereum/retesteth/build.gradle
Unescape View File

@ -43,8 +43,8 @@ dependencies {
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
testImplementation 'junit:junit'
testImplementation 'org.assertj:assertj-core'

4
ethereum/rlp/build.gradle
Unescape View File

@ -35,8 +35,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
jmh project(':util')

4
ethereum/stratum/build.gradle
Unescape View File

@ -37,8 +37,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
testImplementation project(':testutil')

4
ethereum/trie/build.gradle
Unescape View File

@ -33,7 +33,7 @@ dependencies {
implementation project(':services:kvstore')
implementation 'com.google.guava:guava'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation 'org.bouncycastle:bcprov-jdk15on'
testImplementation project(':testutil')
@ -41,7 +41,7 @@ dependencies {
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
testImplementation 'junit:junit'
testImplementation 'org.apache.tuweni:tuweni-units'
testImplementation 'org.apache.tuweni:units'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
}

14
gradle/versions.gradle
Unescape View File

@ -78,13 +78,13 @@ dependencyManagement {
dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
dependency 'org.fusesource.jansi:jansi:1.8'
dependency 'org.apache.tuweni:tuweni-bytes:1.1.0'
dependency 'org.apache.tuweni:tuweni-config:1.1.0'
dependency 'org.apache.tuweni:tuweni-crypto:1.1.0'
dependency 'org.apache.tuweni:tuweni-io:1.1.0'
dependency 'org.apache.tuweni:tuweni-toml:1.1.0'
dependency 'org.apache.tuweni:tuweni-units:1.1.0'
dependency 'org.apache.tuweni:tuweni-net:1.1.0'
dependency 'org.apache.tuweni:bytes:1.2.0'
dependency 'org.apache.tuweni:config:1.2.0'
dependency 'org.apache.tuweni:crypto:1.2.0'
dependency 'org.apache.tuweni:io:1.2.0'
dependency 'org.apache.tuweni:toml:1.2.0'
dependency 'org.apache.tuweni:units:1.2.0'
dependency 'org.apache.tuweni:net:1.2.0'
dependency 'org.assertj:assertj-core:3.16.1'

4
plugin-api/build.gradle
Unescape View File

@ -27,8 +27,8 @@ jar {
}
dependencies {
api 'org.apache.tuweni:tuweni-bytes'
api 'org.apache.tuweni:tuweni-units'
api 'org.apache.tuweni:bytes'
api 'org.apache.tuweni:units'
}
configurations { testArtifacts }

2
plugins/rocksdb/build.gradle
Unescape View File

@ -43,7 +43,7 @@ dependencies {
implementation 'info.picocli:picocli'
implementation 'io.prometheus:simpleclient'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation 'org.rocksdb:rocksdbjni'
runtimeOnly 'org.apache.logging.log4j:log4j-core'

6
privacy-contracts/build.gradle
Unescape View File

@ -16,9 +16,9 @@
jar { enabled = true }
dependencies {
implementation 'net.consensys:orion'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-io'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:io'
implementation 'org.apache.tuweni:toml'
implementation 'org.web3j:abi'
implementation 'org.web3j:besu'
}

2
services/kvstore/build.gradle
Unescape View File

@ -37,7 +37,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.prometheus:simpleclient'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
implementation 'org.rocksdb:rocksdbjni'
runtimeOnly 'org.apache.logging.log4j:log4j-core'

2
services/tasks/build.gradle
Unescape View File

@ -38,7 +38,7 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:bytes'
runtimeOnly 'org.apache.logging.log4j:log4j-core'

6
testutil/build.gradle
Unescape View File

@ -36,9 +36,9 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp'
implementation 'junit:junit'
implementation 'net.consensys:orion'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-io'
implementation 'org.apache.tuweni:tuweni-toml'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:io'
implementation 'org.apache.tuweni:toml'
implementation 'org.assertj:assertj-core'
implementation 'org.mockito:mockito-core'
implementation 'org.web3j:core'

4
util/build.gradle
Unescape View File

@ -34,8 +34,8 @@ dependencies {
implementation 'com.google.guava:guava'
implementation 'io.vertx:vertx-core'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:bytes'
implementation 'org.apache.tuweni:units'
runtimeOnly 'org.apache.logging.log4j:log4j-core'

Write Preview
Loading…
Cancel
Save