Update Gradle from 9.4.1 to 9.5.0

Also updates some dependencies:

- nmcp from 1.4.4 to 1.5.0
- pmd from 7.20.0 to 7.24.0
- grpc from 1.80.0 to 1.81.0
- opentelemetry-grpc-1.6 from 2.26.1-alpha to 2.27.0-alpha

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>

Author: bestbeforetoday

build.gradle

@@ -7,8 +7,8 @@
 plugins {
     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
+    id "com.gradleup.nmcp.aggregation" version "1.5.0"
+    id "com.gradleup.nmcp" version "1.5.0" apply false
 }
 
 version = '2.5.9'
@@ -38,6 +38,7 @@ dependencies {
 
 allprojects {
     apply plugin: "com.diffplug.spotless"
+    apply plugin: "com.github.ben-manes.versions"
 
     repositories {
         mavenCentral()

fabric-chaincode-docker/Dockerfile

@@ -9,7 +9,7 @@ RUN curl -s "https://get.sdkman.io" | bash
 SHELL ["/bin/bash", "-c"]
 
 RUN . /root/.sdkman/bin/sdkman-init.sh \
-    && sdk install gradle 9.4.1 \
+    && sdk install gradle 9.5.0 \
     && sdk install maven 3.9.15
 
 FROM ${JAVA_IMAGE} AS dependencies

fabric-chaincode-shim/build.gradle

@@ -9,14 +9,15 @@ plugins {
     id 'signing'
     id 'jacoco'
     id 'pmd'
-    id "com.gradleup.nmcp"
+    id 'com.gradleup.nmcp'
 }
 
 pmd {
-    toolVersion = '7.20.0'
+    toolVersion = '7.24.0'
     ruleSetFiles = files('../pmd-ruleset.xml')
     ruleSets = [] // explicitly set to empty to avoid using the default configuration
     ignoreFailures = false
+    consoleOutput = true
 }
 
 pmdTest.enabled = false
@@ -30,13 +31,8 @@ tasks.withType(Test).configureEach {
 }
 
 dependencies {
-    constraints {
-        pmd('org.apache.commons:commons-lang3:3.19.0') {
-            because('CVE-2025-48924')
-        }
-    }
     implementation platform('com.google.protobuf:protobuf-bom:4.34.1')
-    implementation platform('io.grpc:grpc-bom:1.80.0')
+    implementation platform('io.grpc:grpc-bom:1.81.0')
     implementation platform('io.opentelemetry:opentelemetry-bom:1.61.0')
     implementation platform("org.bouncycastle:bc-jdk18on-bom:1.84")
 
@@ -61,7 +57,7 @@ dependencies {
     implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
     implementation 'io.opentelemetry:opentelemetry-extension-trace-propagators'
     implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.40.0'
-    implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.26.1-alpha'
+    implementation 'io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.27.0-alpha'
 }
 
 sourceSets {
@@ -283,8 +279,8 @@ signing {
     useInMemoryPgpKeys(signingKey, signingPassword)
 
     required = {
-        gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToNmcpRepository")
-            || gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToGitHubRepository")
+        gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToNmcpRepository") ||
+        gradle.taskGraph.hasTask(":${project.name}:publishShimPublicationToGitHubRepository")
     }
 
     sign publishing.publications.shim

fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java

@@ -66,7 +66,7 @@ class InvocationStubImpl implements ChaincodeStub {
     private static final String UNSPECIFIED_END_KEY = "";
     private static final Logger LOGGER = Logger.getLogger(InvocationStubImpl.class.getName());
 
-    public static final String MAX_UNICODE_RUNE = "\udbff\udfff";
+    private static final String MAX_UNICODE_RUNE = "\udbff\udfff";
     private static final String CORE_PEER_LOCALMSPID = "CORE_PEER_LOCALMSPID";
 
     private static final Function<QueryResultBytes, org.hyperledger.fabric.protos.ledger.queryresult.KeyModification>

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists