update to latest release of tuweni. Switch from org.apache to io.tmio

Consensys · Oct 11, 2024 · b6e81b2 · b6e81b2
1 parent d8a8cc4
commit b6e81b2
Show file tree

Hide file tree

Showing 44 changed files with 69 additions and 69 deletions.
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -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'

diff --git a/beacon/pow/build.gradle b/beacon/pow/build.gradle
@@ -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'))

diff --git a/beacon/sync/build.gradle b/beacon/sync/build.gradle
@@ -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'))

diff --git a/beacon/validator/build.gradle b/beacon/validator/build.gradle
@@ -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'))

diff --git a/build.gradle b/build.gradle
@@ -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'

diff --git a/data/beaconrestapi/build.gradle b/data/beaconrestapi/build.gradle
@@ -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'))

diff --git a/data/provider/build.gradle b/data/provider/build.gradle
@@ -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'))

diff --git a/data/serializer/build.gradle b/data/serializer/build.gradle
@@ -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'))

diff --git a/eth-benchmark-tests/build.gradle b/eth-benchmark-tests/build.gradle
@@ -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'))
 
@@ -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'
 }
diff --git a/eth-reference-tests/build.gradle b/eth-reference-tests/build.gradle
@@ -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'
 }
 

diff --git a/eth-tests/build.gradle b/eth-tests/build.gradle
@@ -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'
 }
diff --git a/ethereum/dataproviders/build.gradle b/ethereum/dataproviders/build.gradle
@@ -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'))

diff --git a/ethereum/executionclient/build.gradle b/ethereum/executionclient/build.gradle
@@ -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'

diff --git a/ethereum/json-types/build.gradle b/ethereum/json-types/build.gradle
@@ -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'))
 }
diff --git a/ethereum/networks/build.gradle b/ethereum/networks/build.gradle
@@ -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'
 

diff --git a/ethereum/signingrecord/build.gradle b/ethereum/signingrecord/build.gradle
@@ -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'
 }
diff --git a/ethereum/spec/build.gradle b/ethereum/spec/build.gradle
@@ -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')
@@ -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')
@@ -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'

diff --git a/ethereum/statetransition/build.gradle b/ethereum/statetransition/build.gradle
@@ -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'))

diff --git a/fork-choice-tests/build.gradle b/fork-choice-tests/build.gradle
@@ -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'
 }
diff --git a/fuzz/build.gradle b/fuzz/build.gradle
@@ -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'

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -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'

diff --git a/infrastructure/bls-keystore/build.gradle b/infrastructure/bls-keystore/build.gradle
@@ -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'

diff --git a/infrastructure/bls/build.gradle b/infrastructure/bls/build.gradle
@@ -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'
 }
diff --git a/infrastructure/bytes/build.gradle b/infrastructure/bytes/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'io.tmio:tuweni-bytes'
 }
diff --git a/infrastructure/crypto/build.gradle b/infrastructure/crypto/build.gradle
@@ -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'

diff --git a/infrastructure/io/build.gradle b/infrastructure/io/build.gradle
@@ -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')
 

diff --git a/infrastructure/jackson/build.gradle b/infrastructure/jackson/build.gradle
@@ -4,5 +4,5 @@ dependencies {
 
     implementation project(':infrastructure:bytes')
 
-    implementation 'org.apache.tuweni:tuweni-units'
+    implementation 'io.tmio:tuweni-units'
 }
diff --git a/infrastructure/json/build.gradle b/infrastructure/json/build.gradle
@@ -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'

diff --git a/infrastructure/kzg/build.gradle b/infrastructure/kzg/build.gradle
@@ -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'
 

diff --git a/infrastructure/logging/build.gradle b/infrastructure/logging/build.gradle
@@ -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'

diff --git a/infrastructure/metrics/build.gradle b/infrastructure/metrics/build.gradle
@@ -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'
 

diff --git a/infrastructure/ssz/build.gradle b/infrastructure/ssz/build.gradle
@@ -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'

diff --git a/infrastructure/ssz/generator/build.gradle b/infrastructure/ssz/generator/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-  compileOnly 'org.apache.tuweni:tuweni-bytes'
+  compileOnly 'io.tmio:tuweni-bytes'
   implementation project(':infrastructure:ssz')
 }
 

diff --git a/infrastructure/yaml/build.gradle b/infrastructure/yaml/build.gradle
@@ -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'
 }
diff --git a/networking/eth2/build.gradle b/networking/eth2/build.gradle
@@ -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'))

diff --git a/networking/p2p/build.gradle b/networking/p2p/build.gradle
@@ -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'))
@@ -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'