Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update tuweni. Switch from org.apache to io.tmio #8712

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −69
Open

update tuweni. Switch from org.apache to io.tmio #8712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 acceptance-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
testFixturesImplementation 'io.libp2p:jvm-libp2p'
testFixturesImplementation 'org.apache.commons:commons-lang3'
testFixturesImplementation 'commons-io:commons-io'
testFixturesImplementation 'org.apache.tuweni:tuweni-bytes'
testFixturesImplementation 'io.tmio:tuweni-bytes'
testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api'
testFixturesImplementation 'org.testcontainers:testcontainers'
testFixturesImplementation 'org.testcontainers:junit-jupiter'
Expand Down
2 changes: 1 addition & 1 deletion beacon/pow/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

api 'org.web3j:core'

implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation testFixtures(project(':infrastructure:async'))
testImplementation testFixtures(project(':infrastructure:time'))
Expand Down
2 changes: 1 addition & 1 deletion beacon/sync/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation project(':storage:api')
implementation project(':infrastructure:events')

implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'

testImplementation testFixtures(project(':ethereum:spec'))
testImplementation testFixtures(project(':ethereum:statetransition'))
Expand Down
4 changes: 2 additions & 2 deletions beacon/validator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
implementation project(':ethereum:json-types')

implementation 'it.unimi.dsi:fastutil'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-ssz'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-ssz'

testImplementation project(':infrastructure:metrics')
testImplementation testFixtures(project(':ethereum:spec'))
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ subprojects {
runtimeOnly 'org.apache.logging.log4j:log4j-core'
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'

testImplementation 'org.apache.tuweni:tuweni-junit'
testImplementation 'io.tmio:tuweni-junit'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
Expand Down
2 changes: 1 addition & 1 deletion data/beaconrestapi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
implementation 'io.swagger.core.v3:swagger-annotations'
implementation 'io.github.classgraph:classgraph'
implementation 'io.javalin:javalin'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'
implementation 'org.webjars:swagger-ui'

testImplementation testFixtures(project(':storage'))
Expand Down
2 changes: 1 addition & 1 deletion data/provider/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {

implementation project(':ethereum:json-types')

implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation testFixtures(project(':ethereum:spec'))
testImplementation testFixtures(project(':infrastructure:async'))
Expand Down
2 changes: 1 addition & 1 deletion data/serializer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation project(':infrastructure:jackson')
implementation project(':infrastructure:async')

implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation project(':data:provider')
testImplementation testFixtures(project(':ethereum:spec'))
Expand Down
8 changes: 4 additions & 4 deletions eth-benchmark-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ dependencies {
implementation testFixtures(project(':ethereum:statetransition'))
jmhImplementation testFixtures(project(':eth-benchmark-tests'))

implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'

jmhImplementation project(':infrastructure:crypto')
jmhImplementation 'org.apache.tuweni:tuweni-ssz'
jmhImplementation 'io.tmio:tuweni-ssz'
jmhImplementation testFixtures(project(':ethereum:weaksubjectivity'))
jmhImplementation testFixtures(project(':infrastructure:async'))

Expand All @@ -34,6 +34,6 @@ dependencies {
testFixturesImplementation testFixtures(project(':ethereum:statetransition'))
testFixturesImplementation testFixtures(project(':storage'))

testFixturesImplementation 'org.apache.tuweni:tuweni-bytes'
testFixturesImplementation 'org.apache.tuweni:tuweni-ssz'
testFixturesImplementation 'io.tmio:tuweni-bytes'
testFixturesImplementation 'io.tmio:tuweni-ssz'
}
6 changes: 3 additions & 3 deletions eth-reference-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ dependencies {
referenceTestImplementation 'org.hyperledger.besu:plugin-api'
referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
referenceTestImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
referenceTestImplementation 'org.apache.tuweni:tuweni-bytes'
referenceTestImplementation 'org.apache.tuweni:tuweni-junit'
referenceTestImplementation 'org.apache.tuweni:tuweni-ssz'
referenceTestImplementation 'io.tmio:tuweni-bytes'
referenceTestImplementation 'io.tmio:tuweni-junit'
referenceTestImplementation 'io.tmio:tuweni-ssz'
referenceTestImplementation 'org.xerial.snappy:snappy-java'
}

Expand Down
4 changes: 2 additions & 2 deletions eth-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation 'org.apache.commons:commons-text'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-units'
implementation 'org.junit.jupiter:junit-jupiter-params'
}
2 changes: 1 addition & 1 deletion ethereum/dataproviders/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dependencies {
implementation project(':infrastructure:async')
implementation project(':infrastructure:metrics')

implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'

testImplementation testFixtures(project(':ethereum:spec'))
testImplementation testFixtures(project(':ethereum:networks'))
Expand Down
2 changes: 1 addition & 1 deletion ethereum/executionclient/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation project(':ethereum:events')

api 'org.web3j:core'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'
implementation 'io.jsonwebtoken:jjwt-api'

runtimeOnly 'io.jsonwebtoken:jjwt-impl'
Expand Down
2 changes: 1 addition & 1 deletion ethereum/json-types/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
implementation project(':infrastructure:restapi')
implementation project(':infrastructure:http')

implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation testFixtures(project(':ethereum:spec'))
}
2 changes: 1 addition & 1 deletion ethereum/networks/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {
implementation project(':infrastructure:io')
implementation project(':infrastructure:exceptions')
implementation project(':infrastructure:time')
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation 'tech.pegasys.discovery:discovery'

Expand Down
2 changes: 1 addition & 1 deletion ethereum/signingrecord/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
implementation project(':infrastructure:yaml')
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
}
14 changes: 7 additions & 7 deletions ethereum/spec/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api 'it.unimi.dsi:fastutil'
api 'org.apache.tuweni:tuweni-bytes'
api 'io.tmio:tuweni-bytes'
api project(':infrastructure:bls')
api project(':infrastructure:bytes')
api project(':infrastructure:collections')
Expand All @@ -9,9 +9,9 @@ dependencies {

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-ssz'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-ssz'
implementation 'io.tmio:tuweni-units'
implementation project(':ethereum:performance-trackers')
implementation project(':ethereum:execution-types')
implementation project(':ethereum:pow:api')
Expand All @@ -28,16 +28,16 @@ dependencies {
implementation project(':infrastructure:time')

testFixturesApi 'com.google.guava:guava'
testFixturesApi 'org.apache.tuweni:tuweni-bytes'
testFixturesApi 'io.tmio:tuweni-bytes'
testFixturesApi project(':ethereum:pow:api')
testFixturesApi project(':infrastructure:ssz')
testFixturesApi project(':infrastructure:unsigned')

testFixturesImplementation 'com.fasterxml.jackson.core:jackson-databind'
testFixturesImplementation 'net.jqwik:jqwik'
testFixturesImplementation 'org.apache.logging.log4j:log4j-api'
testFixturesImplementation 'org.apache.tuweni:tuweni-units'
testFixturesImplementation 'org.apache.tuweni:tuweni-ssz'
testFixturesImplementation 'io.tmio:tuweni-units'
testFixturesImplementation 'io.tmio:tuweni-ssz'
testFixturesImplementation 'org.hyperledger.besu.internal:core'
testFixturesImplementation 'org.hyperledger.besu.internal:config'
testFixturesImplementation 'org.hyperledger.besu:besu-datatypes'
Expand Down
2 changes: 1 addition & 1 deletion ethereum/statetransition/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation project(':storage')
implementation project(':storage:api')

implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation testFixtures(project(':ethereum:spec'))
testImplementation testFixtures(project(':ethereum:networks'))
Expand Down
4 changes: 2 additions & 2 deletions fork-choice-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ dependencies {

integrationTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
integrationTestImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
integrationTestImplementation 'org.apache.tuweni:tuweni-bytes'
integrationTestImplementation 'org.apache.tuweni:tuweni-junit'
integrationTestImplementation 'io.tmio:tuweni-bytes'
integrationTestImplementation 'io.tmio:tuweni-junit'
}
2 changes: 1 addition & 1 deletion fuzz/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
implementation project(':infrastructure:bls')
implementation project(':infrastructure:ssz')

implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'
implementation 'it.unimi.dsi:fastutil'

testImplementation 'org.xerial.snappy:snappy-java'
Expand Down
2 changes: 1 addition & 1 deletion gradle/versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencyManagement {

dependency 'javax.annotation:javax.annotation-api:1.3.2'

dependencySet(group: 'org.apache.tuweni', version: '2.3.1') {
dependencySet(group: 'io.tmio', version: '2.4.2') {
entry 'tuweni-bytes'
entry 'tuweni-crypto'
entry 'tuweni-junit'
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/bls-keystore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ dependencies {
implementation 'org.bouncycastle:bcprov-jdk18on'
implementation 'com.google.guava:guava'
implementation 'org.apache.logging.log4j:log4j-api'
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-crypto'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-crypto'

testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter-engine'
Expand Down
6 changes: 3 additions & 3 deletions infrastructure/bls/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies {
api 'org.bouncycastle:bcprov-jdk18on'

implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-ssz'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-ssz'
implementation 'commons-io:commons-io'
implementation 'tech.pegasys:jblst'
implementation project(':infrastructure:crypto')
implementation project(':infrastructure:logging')

testFixturesImplementation 'org.apache.tuweni:tuweni-bytes'
testFixturesImplementation 'io.tmio:tuweni-bytes'
}
2 changes: 1 addition & 1 deletion infrastructure/bytes/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'
}
2 changes: 1 addition & 1 deletion infrastructure/crypto/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api 'org.bouncycastle:bcprov-jdk18on'
api 'org.apache.tuweni:tuweni-bytes'
api 'io.tmio:tuweni-bytes'


jmhImplementation 'org.bouncycastle:bcprov-jdk18on'
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/io/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'
implementation 'net.java.dev.jna:jna'
implementation project(':infrastructure:exceptions')

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/jackson/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ dependencies {

implementation project(':infrastructure:bytes')

implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'
}
2 changes: 1 addition & 1 deletion infrastructure/json/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
implementation project(':infrastructure:logging')

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testFixturesImplementation 'com.fasterxml.jackson.core:jackson-databind'
testFixturesImplementation 'commons-io:commons-io'
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/kzg/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ dependencies {
implementation project(':infrastructure:io')
implementation project(':infrastructure:http')

implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'org.apache.tuweni:tuweni-ssz'
implementation 'io.tmio:tuweni-bytes'
implementation 'io.tmio:tuweni-ssz'
implementation 'io.consensys.protocols:jc-kzg-4844'
implementation 'commons-io:commons-io'

Expand Down
4 changes: 2 additions & 2 deletions infrastructure/logging/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api 'org.apache.tuweni:tuweni-bytes'
api 'org.apache.tuweni:tuweni-units'
api 'io.tmio:tuweni-bytes'
api 'io.tmio:tuweni-units'

implementation 'org.web3j:utils'
implementation 'org.apache.logging.log4j:log4j-core'
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/metrics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
implementation 'io.prometheus:simpleclient'
implementation 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-web'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'
implementation 'org.hdrhistogram:HdrHistogram'
implementation 'org.hyperledger.besu.internal:metrics-core'

Expand Down
6 changes: 3 additions & 3 deletions infrastructure/ssz/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ dependencies {

implementation 'it.unimi.dsi:fastutil'
implementation 'org.apache.commons:commons-lang3'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'io.tmio:tuweni-units'

testImplementation testFixtures(project(':infrastructure:collections'))
testImplementation testFixtures(project(':infrastructure:serviceutils'))

testFixturesApi 'org.apache.tuweni:tuweni-bytes'
testFixturesApi 'org.apache.tuweni:tuweni-units'
testFixturesApi 'io.tmio:tuweni-bytes'
testFixturesApi 'io.tmio:tuweni-units'
testFixturesApi project(':infrastructure:unsigned')
testFixturesImplementation project(':infrastructure:bytes')
testFixturesImplementation 'it.unimi.dsi:fastutil'
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/ssz/generator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
compileOnly 'org.apache.tuweni:tuweni-bytes'
compileOnly 'io.tmio:tuweni-bytes'
implementation project(':infrastructure:ssz')
}

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/yaml/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
implementation project(':infrastructure:jackson')
implementation 'org.apache.tuweni:tuweni-bytes'
implementation 'io.tmio:tuweni-bytes'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
}
2 changes: 1 addition & 1 deletion networking/eth2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {

implementation 'io.libp2p:jvm-libp2p'
implementation 'io.netty:netty-codec-http'
implementation 'org.apache.tuweni:tuweni-ssz'
implementation 'io.tmio:tuweni-ssz'
implementation 'org.xerial.snappy:snappy-java'

testImplementation testFixtures(project(':infrastructure:metrics'))
Expand Down
6 changes: 3 additions & 3 deletions networking/p2p/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ dependencies {
implementation 'io.libp2p:jvm-libp2p'
implementation 'io.netty:netty-handler'
implementation 'io.projectreactor:reactor-core'
implementation 'org.apache.tuweni:tuweni-units'
implementation 'org.apache.tuweni:tuweni-crypto'
implementation 'io.tmio:tuweni-units'
implementation 'io.tmio:tuweni-crypto'
implementation 'tech.pegasys.discovery:discovery'

testImplementation testFixtures(project(':ethereum:statetransition'))
Expand All @@ -32,7 +32,7 @@ dependencies {

testImplementation 'org.hyperledger.besu.internal:metrics-core'

testFixturesApi 'org.apache.tuweni:tuweni-bytes'
testFixturesApi 'io.tmio:tuweni-bytes'

testFixturesCompileOnly 'org.jetbrains.kotlin:kotlin-stdlib'

Expand Down
Loading