From 04857a08274637f9120603d719ace711ce1635e4 Mon Sep 17 00:00:00 2001
From: Roman Vaseev <4833306+Filter94@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:32:30 +0200
Subject: [PATCH] Adding missing dependencies from exclusion api (#221)

* Adding missing dependencies from exclusion api

* coordinator: switch tuweni to io.tmio fork

---------

Co-authored-by: Pedro Novais <1478752+jpnovais@users.noreply.github.com>
---
 .../net.consensys.zkevm.kotlin-common-conventions.gradle       | 3 ++-
 gradle/libs.versions.toml                                      | 2 +-
 .../net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt | 2 --
 jvm-libs/linea/core/domain-models/build.gradle                 | 2 +-
 jvm-libs/linea/core/traces/build.gradle                        | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/groovy/net.consensys.zkevm.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/net.consensys.zkevm.kotlin-common-conventions.gradle
index c435c4330..b4f878854 100644
--- a/buildSrc/src/main/groovy/net.consensys.zkevm.kotlin-common-conventions.gradle
+++ b/buildSrc/src/main/groovy/net.consensys.zkevm.kotlin-common-conventions.gradle
@@ -45,7 +45,8 @@ dependencies {
     exclude group: 'tech.pegasys.teku.internal', module: 'metrics'
     exclude group: 'tech.pegasys.teku.internal', module: 'time'
   }
-  implementation "org.apache.tuweni:tuweni-units:${libs.versions.tuweni.get()}"
+
+  implementation "io.tmio:tuweni-units:${libs.versions.tuweni.get()}"
   //</utils>
 
   //<logging>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 146354e45..a4204f80d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ netty = "4.1.92.Final"
 picoli = "4.7.1"
 restassured = "5.3.0"
 teku = "23.1.1"
-tuweni = "2.3.1"
+tuweni = "2.4.2"
 vertx = "4.5.0"
 web3j = "4.12.0"
 wiremock = "3.0.1"
diff --git a/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt
index 338d0b302..01e9bf426 100644
--- a/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt
+++ b/jvm-libs/generic/json-rpc/src/main/kotlin/net/consensys/linea/jsonrpc/client/SequentialIdSupplier.kt
@@ -2,9 +2,7 @@ package net.consensys.linea.jsonrpc.client
 
 import java.util.concurrent.atomic.AtomicLong
 import java.util.function.Supplier
-import javax.annotation.concurrent.ThreadSafe
 
-@ThreadSafe
 class SequentialIdSupplier : Supplier<Any> {
   private var id = AtomicLong(0)
 
diff --git a/jvm-libs/linea/core/domain-models/build.gradle b/jvm-libs/linea/core/domain-models/build.gradle
index 215e5cf54..2cbc631dc 100644
--- a/jvm-libs/linea/core/domain-models/build.gradle
+++ b/jvm-libs/linea/core/domain-models/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   implementation project(":jvm-libs:generic:extensions:kotlin")
-  implementation "org.apache.tuweni:tuweni-units:${libs.versions.tuweni.get()}"
+  implementation "io.tmio:tuweni-units:${libs.versions.tuweni.get()}"
 }
 
 jar {
diff --git a/jvm-libs/linea/core/traces/build.gradle b/jvm-libs/linea/core/traces/build.gradle
index ec8a39901..0f5cad399 100644
--- a/jvm-libs/linea/core/traces/build.gradle
+++ b/jvm-libs/linea/core/traces/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-  implementation "org.apache.tuweni:tuweni-units:${libs.versions.tuweni.get()}"
+  implementation "io.tmio:tuweni-units:${libs.versions.tuweni.get()}"
   implementation project(':jvm-libs:generic:extensions:kotlin')
   testImplementation project(':jvm-libs:linea:testing:file-system')
   testImplementation "com.sksamuel.hoplite:hoplite-core:${libs.versions.hoplite.get()}"