Skip to content

Commit

Permalink
Revert "build: update dependencies version and gradle version and del…
Browse files Browse the repository at this point in the history
…ete libs…"

This reverts commit 26c8bc1.
  • Loading branch information
GrapeBaBa committed Apr 7, 2024
1 parent a5a04f1 commit 86cc45d
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-rc-4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions hildr-batcher/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ dependencies {
implementation 'io.micrometer:micrometer-tracing-bridge-otel'

// Logback
implementation 'ch.qos.logback:logback-core:1.4.12'
implementation 'ch.qos.logback:logback-classic:1.4.14'
implementation 'ch.qos.logback:logback-core:1.4.7'
implementation 'ch.qos.logback:logback-classic:1.4.7'
implementation 'org.slf4j:slf4j-api:2.0.7'

implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.26.0-alpha")
Expand Down Expand Up @@ -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.9")
testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.2")

errorprone("com.google.errorprone:error_prone_core:2.18.0")
}
Expand Down
17 changes: 9 additions & 8 deletions hildr-node/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,19 @@ tasks.withType(JavaExec).configureEach {
dependencies {
implementation project(':hildr-utilities')
// This dependency is used by the application.
implementation 'com.google.guava:guava:33.0.0-jre'
implementation 'com.google.guava:guava:31.1-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.9")
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9")
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2")

implementation('org.web3j:core:4.11.2') {
implementation('org.web3j:core:4.11.0') {
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'
Expand All @@ -104,8 +105,8 @@ dependencies {
implementation 'io.micrometer:micrometer-tracing-bridge-otel'

// Logback
implementation 'ch.qos.logback:logback-core:1.4.12'
implementation 'ch.qos.logback:logback-classic:1.4.14'
implementation 'ch.qos.logback:logback-core:1.4.7'
implementation 'ch.qos.logback:logback-classic:1.4.7'
implementation 'org.slf4j:slf4j-api:2.0.7'

implementation platform("io.opentelemetry:opentelemetry-bom-alpha:1.26.0-alpha")
Expand Down Expand Up @@ -145,7 +146,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.5'
implementation 'org.xerial.snappy:snappy-java:1.1.10.3'

implementation 'org.apache.logging.log4j:log4j-api:3.0.0-alpha1'
// implementation 'org.apache.logging.log4j:log4j-core:3.0.0-alpha1'
Expand All @@ -164,7 +165,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.9")
testImplementation("com.squareup.okhttp3:mockwebserver:5.0.0-alpha.2")
}

// Apply a specific Java toolchain to ease working on different environments.
Expand Down
13 changes: 7 additions & 6 deletions hildr-utilities/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,19 @@ tasks.withType(JavaExec).configureEach {
}

dependencies {
api 'com.google.guava:guava:33.0.0-jre'
api 'com.google.guava:guava:31.1-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.9")
api("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9")
api('org.web3j:core:4.11.2') {
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') {
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'
Expand All @@ -80,8 +81,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.12'
implementation 'ch.qos.logback:logback-classic:1.4.14'
implementation 'ch.qos.logback:logback-core:1.4.7'
implementation 'ch.qos.logback:logback-classic:1.4.7'

implementation 'com.google.protobuf:protobuf-java:3.25.1'
implementation 'io.tmio:tuweni-units:2.4.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public void start() {

/** This method is synchronized to avoid double start from doAppender(). */
protected void maybeStart() {
streamWriteLock.lock();
lock.lock();
try {
if (!started) {
this.start();
}
} finally {
streamWriteLock.unlock();
lock.unlock();
}
}

Expand Down
Binary file added libs/core-4.11.1-SNAPSHOT.jar
Binary file not shown.

0 comments on commit 86cc45d

Please sign in to comment.