diff --git a/acceptance-tests/dsl/build.gradle b/acceptance-tests/dsl/build.gradle index 3941406bea..b71b32cbc6 100644 --- a/acceptance-tests/dsl/build.gradle +++ b/acceptance-tests/dsl/build.gradle @@ -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' diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle index f71267817b..a250291335 100644 --- a/acceptance-tests/tests/build.gradle +++ b/acceptance-tests/tests/build.gradle @@ -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' diff --git a/besu/build.gradle b/besu/build.gradle index 954054fa42..3aa2cdffed 100644 --- a/besu/build.gradle +++ b/besu/build.gradle @@ -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' diff --git a/config/build.gradle b/config/build.gradle index a0e489be54..ac2be75cdc 100644 --- a/config/build.gradle +++ b/config/build.gradle @@ -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') diff --git a/consensus/clique/build.gradle b/consensus/clique/build.gradle index 37d56a3844..69ebf9042a 100644 --- a/consensus/clique/build.gradle +++ b/consensus/clique/build.gradle @@ -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') diff --git a/consensus/common/build.gradle b/consensus/common/build.gradle index 73b4f719ea..4fadb41916 100644 --- a/consensus/common/build.gradle +++ b/consensus/common/build.gradle @@ -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') diff --git a/consensus/ibft/build.gradle b/consensus/ibft/build.gradle index eaba3c4f77..33e40d7e15 100644 --- a/consensus/ibft/build.gradle +++ b/consensus/ibft/build.gradle @@ -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') diff --git a/consensus/ibftlegacy/build.gradle b/consensus/ibftlegacy/build.gradle index 5f9247fa31..d1055d0625 100644 --- a/consensus/ibftlegacy/build.gradle +++ b/consensus/ibftlegacy/build.gradle @@ -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') diff --git a/crypto/build.gradle b/crypto/build.gradle index 90958b0b19..15f6dcd54e 100644 --- a/crypto/build.gradle +++ b/crypto/build.gradle @@ -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' diff --git a/enclave/build.gradle b/enclave/build.gradle index 35e5df0971..1767a5b998 100644 --- a/enclave/build.gradle +++ b/enclave/build.gradle @@ -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') diff --git a/ethereum/api/build.gradle b/ethereum/api/build.gradle index 87ce0a4d2e..caee178bbe 100644 --- a/ethereum/api/build.gradle +++ b/ethereum/api/build.gradle @@ -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' diff --git a/ethereum/blockcreation/build.gradle b/ethereum/blockcreation/build.gradle index 0e38065517..129d6e5bcf 100644 --- a/ethereum/blockcreation/build.gradle +++ b/ethereum/blockcreation/build.gradle @@ -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') diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle index 4fbdf55d58..269c49ebaf 100644 --- a/ethereum/core/build.gradle +++ b/ethereum/core/build.gradle @@ -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' diff --git a/ethereum/eth/build.gradle b/ethereum/eth/build.gradle index 051d462267..a8db24751b 100644 --- a/ethereum/eth/build.gradle +++ b/ethereum/eth/build.gradle @@ -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" diff --git a/ethereum/ethstats/build.gradle b/ethereum/ethstats/build.gradle index e6810211db..0c77e97ae7 100644 --- a/ethereum/ethstats/build.gradle +++ b/ethereum/ethstats/build.gradle @@ -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') diff --git a/ethereum/mock-p2p/build.gradle b/ethereum/mock-p2p/build.gradle index b1e605b68f..6c2e6fc795 100644 --- a/ethereum/mock-p2p/build.gradle +++ b/ethereum/mock-p2p/build.gradle @@ -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' diff --git a/ethereum/p2p/build.gradle b/ethereum/p2p/build.gradle index f683326e1f..054699e20d 100644 --- a/ethereum/p2p/build.gradle +++ b/ethereum/p2p/build.gradle @@ -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" diff --git a/ethereum/permissioning/build.gradle b/ethereum/permissioning/build.gradle index 3a31b183a2..5613879551 100644 --- a/ethereum/permissioning/build.gradle +++ b/ethereum/permissioning/build.gradle @@ -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') diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle index b61252b38f..0d9470d666 100644 --- a/ethereum/referencetests/build.gradle +++ b/ethereum/referencetests/build.gradle @@ -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 } diff --git a/ethereum/retesteth/build.gradle b/ethereum/retesteth/build.gradle index 2bcb6a91e6..98bd11fb48 100644 --- a/ethereum/retesteth/build.gradle +++ b/ethereum/retesteth/build.gradle @@ -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' diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle index cc263f25e8..26fd29d906 100644 --- a/ethereum/rlp/build.gradle +++ b/ethereum/rlp/build.gradle @@ -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') diff --git a/ethereum/stratum/build.gradle b/ethereum/stratum/build.gradle index c896d1fe64..fb15cdc738 100644 --- a/ethereum/stratum/build.gradle +++ b/ethereum/stratum/build.gradle @@ -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') diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle index c5c2b10dc6..7bcf850c15 100644 --- a/ethereum/trie/build.gradle +++ b/ethereum/trie/build.gradle @@ -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' } diff --git a/gradle/versions.gradle b/gradle/versions.gradle index ad99312858..d9fdf4b341 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -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' diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle index 718963d56d..bf484ff8fd 100644 --- a/plugin-api/build.gradle +++ b/plugin-api/build.gradle @@ -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 } diff --git a/plugins/rocksdb/build.gradle b/plugins/rocksdb/build.gradle index c7bcc9f0f3..1968b6682e 100644 --- a/plugins/rocksdb/build.gradle +++ b/plugins/rocksdb/build.gradle @@ -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' diff --git a/privacy-contracts/build.gradle b/privacy-contracts/build.gradle index 2c83727a8c..1fcf55e51c 100644 --- a/privacy-contracts/build.gradle +++ b/privacy-contracts/build.gradle @@ -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' } diff --git a/services/kvstore/build.gradle b/services/kvstore/build.gradle index faf2d99b20..1a865bf3cc 100644 --- a/services/kvstore/build.gradle +++ b/services/kvstore/build.gradle @@ -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' diff --git a/services/tasks/build.gradle b/services/tasks/build.gradle index 93ab36e87a..57c9ab0d7e 100644 --- a/services/tasks/build.gradle +++ b/services/tasks/build.gradle @@ -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' diff --git a/testutil/build.gradle b/testutil/build.gradle index 72aa1b1624..7e9fdee282 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -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' diff --git a/util/build.gradle b/util/build.gradle index 5f149018ec..4d8ff95e11 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -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'