diff --git a/build.gradle b/build.gradle index 55c913bd..91ca5304 100644 --- a/build.gradle +++ b/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() diff --git a/fabric-chaincode-docker/Dockerfile b/fabric-chaincode-docker/Dockerfile index b3fc3da8..de7954ef 100644 --- a/fabric-chaincode-docker/Dockerfile +++ b/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 diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle index ecfe81f5..db44ef74 100644 --- a/fabric-chaincode-shim/build.gradle +++ b/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 diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java index ec0b1ffc..bab0febe 100644 --- a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/impl/InvocationStubImpl.java +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc6..b1b8ef56 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 c61a118f..b52fb7e7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index 739907df..b9bb139f 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/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. diff --git a/gradlew.bat b/gradlew.bat index e509b2dd..aa5f10b0 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%