diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 31839a89..20db9ad5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hildr-batcher/build.gradle b/hildr-batcher/build.gradle index 3fc72eb5..d6b6c9d0 100644 --- a/hildr-batcher/build.gradle +++ b/hildr-batcher/build.gradle @@ -79,8 +79,8 @@ dependencies { implementation 'io.micrometer:micrometer-tracing-bridge-otel' // Logback - implementation 'ch.qos.logback:logback-core:1.4.7' - implementation 'ch.qos.logback:logback-classic:1.4.7' + implementation 'ch.qos.logback:logback-core:1.4.12' + implementation 'ch.qos.logback:logback-classic:1.4.14' implementation 'org.slf4j:slf4j-api:2.0.7' implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.26.0-alpha") @@ -118,7 +118,7 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-reporting:1.9.1' testImplementation 'org.mockito:mockito-junit-jupiter:2.19.0' - testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.2") + testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.9") errorprone("com.google.errorprone:error_prone_core:2.18.0") } diff --git a/hildr-node/build.gradle b/hildr-node/build.gradle index 04a1151f..11072686 100644 --- a/hildr-node/build.gradle +++ b/hildr-node/build.gradle @@ -67,19 +67,18 @@ tasks.withType(JavaExec).configureEach { dependencies { implementation project(':hildr-utilities') // This dependency is used by the application. - implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.google.guava:guava:33.0.0-jre' implementation 'com.github.rholder:guava-retrying:2.0.0' // define any required OkHttp artifacts without version - implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2") - implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2") + implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.9") + implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9") - implementation('org.web3j:core:4.11.0') { + implementation('org.web3j:core:4.11.2') { exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on' exclude group: 'com.squareup.okhttp3', module: 'okhttp' exclude group: 'com.squareup.okhttp3', module: 'logging-interceptor' } - implementation files('../libs/core-4.11.1-SNAPSHOT.jar') implementation('net.osslabz.evm:evm-abi-decoder:0.0.6') implementation 'com.github.gestalt-config:gestalt-core:0.20.4' implementation 'com.github.gestalt-config:gestalt-toml:0.20.4' @@ -105,8 +104,8 @@ dependencies { implementation 'io.micrometer:micrometer-tracing-bridge-otel' // Logback - implementation 'ch.qos.logback:logback-core:1.4.7' - implementation 'ch.qos.logback:logback-classic:1.4.7' + implementation 'ch.qos.logback:logback-core:1.4.12' + implementation 'ch.qos.logback:logback-classic:1.4.14' implementation 'org.slf4j:slf4j-api:2.0.7' implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.26.0-alpha") @@ -146,7 +145,7 @@ dependencies { } implementation 'io.tmio:tuweni-rlp:2.4.2' implementation('tech.pegasys.discovery:discovery:22.12.0') - implementation 'org.xerial.snappy:snappy-java:1.1.10.3' + implementation 'org.xerial.snappy:snappy-java:1.1.10.5' implementation 'org.apache.logging.log4j:log4j-api:3.0.0-alpha1' // implementation 'org.apache.logging.log4j:log4j-core:3.0.0-alpha1' @@ -165,7 +164,7 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-reporting:1.9.1' testImplementation 'org.mockito:mockito-junit-jupiter:2.19.0' - testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.2") + testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.9") } // Apply a specific Java toolchain to ease working on different environments. diff --git a/hildr-utilities/build.gradle b/hildr-utilities/build.gradle index 1e6f46a9..733e07f3 100644 --- a/hildr-utilities/build.gradle +++ b/hildr-utilities/build.gradle @@ -54,19 +54,18 @@ tasks.withType(JavaExec).configureEach { } dependencies { - api 'com.google.guava:guava:31.1-jre' + api 'com.google.guava:guava:33.0.0-jre' api 'com.github.rholder:guava-retrying:2.0.0' api 'org.apache.commons:commons-lang3:3.12.0' - api("com.squareup.okhttp3:okhttp:5.0.0-alpha.2") - api("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2") - api('org.web3j:core:4.11.0') { + api("com.squareup.okhttp3:okhttp:5.0.0-alpha.9") + api("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9") + api('org.web3j:core:4.11.2') { exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on' exclude group: 'com.squareup.okhttp3', module: 'okhttp' exclude group: 'com.squareup.okhttp3', module: 'logging-interceptor' } - api files('libs/core-4.11.1-SNAPSHOT.jar') api 'io.micrometer:micrometer-registry-prometheus:1.11.0' api platform('io.micrometer:micrometer-tracing-bom:1.1.1') api 'io.micrometer:micrometer-tracing' @@ -81,8 +80,8 @@ dependencies { implementation 'com.fasterxml.jackson:jackson-bom:2.15.2' implementation 'com.fasterxml.jackson.core:jackson-core' - implementation 'ch.qos.logback:logback-core:1.4.7' - implementation 'ch.qos.logback:logback-classic:1.4.7' + implementation 'ch.qos.logback:logback-core:1.4.12' + implementation 'ch.qos.logback:logback-classic:1.4.14' implementation 'com.google.protobuf:protobuf-java:3.25.1' implementation 'io.tmio:tuweni-units:2.4.2' diff --git a/hildr-utilities/src/main/java/io/optimism/utilities/telemetry/LazyInitRollingFileAppender.java b/hildr-utilities/src/main/java/io/optimism/utilities/telemetry/LazyInitRollingFileAppender.java index e008ee9e..b6a343f7 100644 --- a/hildr-utilities/src/main/java/io/optimism/utilities/telemetry/LazyInitRollingFileAppender.java +++ b/hildr-utilities/src/main/java/io/optimism/utilities/telemetry/LazyInitRollingFileAppender.java @@ -26,13 +26,13 @@ public void start() { /** This method is synchronized to avoid double start from doAppender(). */ protected void maybeStart() { - lock.lock(); + streamWriteLock.lock(); try { if (!started) { this.start(); } } finally { - lock.unlock(); + streamWriteLock.unlock(); } } diff --git a/libs/core-4.11.1-SNAPSHOT.jar b/libs/core-4.11.1-SNAPSHOT.jar deleted file mode 100644 index 0fe28729..00000000 Binary files a/libs/core-4.11.1-SNAPSHOT.jar and /dev/null differ