diff --git a/build.gradle b/build.gradle index c12b354e..55c913bd 100644 --- a/build.gradle +++ b/build.gradle @@ -5,10 +5,10 @@ */ plugins { - id "com.github.ben-manes.versions" version "0.53.0" - id "com.diffplug.spotless" version "8.1.0" - id "com.gradleup.nmcp.aggregation" version "1.4.3" - id "com.gradleup.nmcp" version "1.4.3" apply false + id "com.github.ben-manes.versions" version "0.54.0" + id "com.diffplug.spotless" version "8.4.0" + id "com.gradleup.nmcp.aggregation" version "1.4.4" + id "com.gradleup.nmcp" version "1.4.4" apply false } version = '2.5.9' @@ -67,13 +67,13 @@ subprojects { dependencies { implementation 'commons-cli:commons-cli:1.11.0' - implementation 'commons-logging:commons-logging:1.3.5' + implementation 'commons-logging:commons-logging:1.3.6' - testImplementation platform('org.junit:junit-bom:6.0.2') + testImplementation platform('org.junit:junit-bom:6.0.3') testImplementation 'org.junit.jupiter:junit-jupiter' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'org.assertj:assertj-core:3.27.7' - testImplementation 'org.mockito:mockito-core:5.21.0' + testImplementation 'org.mockito:mockito-core:5.23.0' testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.1.8' testImplementation 'org.hamcrest:hamcrest-library:3.0' diff --git a/fabric-chaincode-docker/Dockerfile b/fabric-chaincode-docker/Dockerfile index db4d4bd5..b3fc3da8 100644 --- a/fabric-chaincode-docker/Dockerfile +++ b/fabric-chaincode-docker/Dockerfile @@ -9,8 +9,8 @@ RUN curl -s "https://get.sdkman.io" | bash SHELL ["/bin/bash", "-c"] RUN . /root/.sdkman/bin/sdkman-init.sh \ - && sdk install gradle 9.3.0 \ - && sdk install maven 3.9.12 + && sdk install gradle 9.4.1 \ + && sdk install maven 3.9.15 FROM ${JAVA_IMAGE} AS dependencies diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index d5f39a14..ecfe81f5 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/fabric-chaincode-shim/build.gradle @@ -35,13 +35,14 @@ dependencies { because('CVE-2025-48924') } } - implementation platform('com.google.protobuf:protobuf-bom:4.33.4') - implementation platform('io.grpc:grpc-bom:1.78.0') - implementation platform('io.opentelemetry:opentelemetry-bom:1.58.0') + implementation platform('com.google.protobuf:protobuf-bom:4.34.1') + implementation platform('io.grpc:grpc-bom:1.80.0') + implementation platform('io.opentelemetry:opentelemetry-bom:1.61.0') + implementation platform("org.bouncycastle:bc-jdk18on-bom:1.84") implementation 'org.hyperledger.fabric:fabric-protos:0.3.7' - implementation 'org.bouncycastle:bcpkix-jdk18on:1.83' - implementation 'org.bouncycastle:bcprov-jdk18on:1.83' + implementation 'org.bouncycastle:bcpkix-jdk18on' + implementation 'org.bouncycastle:bcprov-jdk18on' implementation 'io.github.classgraph:classgraph:4.8.184' implementation 'com.github.erosb:everit-json-schema:1.14.6' implementation 'org.json:json:20251224' @@ -53,14 +54,14 @@ dependencies { testImplementation 'io.grpc:grpc-inprocess' implementation 'io.opentelemetry:opentelemetry-api' - implementation 'io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha' + implementation 'io.opentelemetry.proto:opentelemetry-proto:1.10.0-alpha' implementation 'io.opentelemetry:opentelemetry-sdk' implementation 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure' implementation 'io.opentelemetry:opentelemetry-sdk-trace' implementation 'io.opentelemetry:opentelemetry-exporter-otlp' implementation 'io.opentelemetry:opentelemetry-extension-trace-propagators' - implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.37.0' - implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.24.0-alpha' + implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.40.0' + implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.26.1-alpha' } sourceSets { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a65..d997cfc6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19a6bdeb..c61a118f 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-9.3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index adff685a..739907df 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/.