Use Java 25 and Gradle 9 (#471)

bestbeforetoday · web-flow · commit 6d84e994a826 · 2025-10-07T10:56:39.000-04:00
- Docker image includes Java 25 and Gradle 9.
- Java 25 is used to compile and test.
- Java 11 remains the minimum supported version.

Signed-off-by: Mark S. Lewis &lt;Mark.S.Lewis@outlook.com&gt;
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
       - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       - name: Publish to GitHub Packages
         run: |
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
       - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       - name: Publish to Maven Central
         run: |
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
       - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       - name: Build the dependencies needed for the image
         run: ./gradlew :fabric-chaincode-docker:copyAllDeps
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 21
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+          java-version: 25
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       - name: Scan
         run: make scan
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       - name: Build and Unit test
         run: ./gradlew :fabric-chaincode-shim:build
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: "lts/*"
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
       - name: Build Docker image
         run: ./gradlew :fabric-chaincode-docker:buildImage
diff --git a/build.gradle b/build.gradle
@@ -72,7 +72,7 @@ subprojects {
     spotless {
         java {
             removeUnusedImports()
-            palantirJavaFormat('2.67.0').formatJavadoc(true)
+            palantirJavaFormat().formatJavadoc(true)
             formatAnnotations()
         }
     }
diff --git a/fabric-chaincode-docker/Dockerfile b/fabric-chaincode-docker/Dockerfile
@@ -1,34 +1,34 @@
-ARG JAVA_IMAGE=eclipse-temurin:21-jdk
+ARG JAVA_IMAGE=eclipse-temurin:25-jdk
 
 FROM ${JAVA_IMAGE} AS builder
-ENV DEBIAN_FRONTEND=noninteractive
 
-# Build tools
 RUN apt-get update \
-    && apt-get -y install zip unzip \       
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get install -y curl zip unzip
 RUN curl -s "https://get.sdkman.io" | bash
 
 SHELL ["/bin/bash", "-c"]
 
 RUN source /root/.sdkman/bin/sdkman-init.sh \
-    && sdk install gradle 8.14.3 \
+    && sdk install gradle 9.1.0 \
     && sdk install maven 3.9.11
 
 FROM ${JAVA_IMAGE} AS dependencies
 
-COPY --from=builder /root/.sdkman/candidates/gradle/current /usr/bin/gradle
-COPY --from=builder /root/.sdkman/candidates/maven/current /usr/bin/maven
+COPY --from=builder /root/.sdkman/candidates/gradle/current /opt/gradle
+COPY --from=builder /root/.sdkman/candidates/maven/current /opt/maven
 
 SHELL ["/bin/bash", "-c"]
-ENV PATH="/usr/bin/maven/bin:/usr/bin/maven/:/usr/bin/gradle:/usr/bin/gradle/bin:${PATH}"
+ENV PATH="/opt/maven/bin:/opt/gradle/bin:${PATH}"
 
 # Coping libs, scripts and sources
-ADD build/distributions/ /root/
+COPY build/distributions/ /root/
 
 #Creating folders structure
-RUN mkdir -p /root/chaincode-java/chaincode/src /root/chaincode-java/chaincode/build/out
+RUN mkdir -p \
+    /root/chaincode-java/chaincode/src \
+    /root/chaincode-java/chaincode/build/out \
+    /root/chaincode-java/shim-src/fabric-chaincode-integration-test \
+    /root/chaincode-java/shim-src/fabric-chaincode-docker
 
 #Making scripts runnable
 RUN chmod +x /root/chaincode-java/start /root/chaincode-java/build.sh
@@ -51,15 +51,15 @@ WORKDIR /root/chaincode-java
 #Gradle doesn't run without settings.gradle file, so create one
 RUN touch settings.gradle \
     && gradle wrapper \
-    && ./gradlew --version \
+    && ./gradlew wrapper \
     && mvn -N wrapper:wrapper
 
 # Creating final javaenv image which will include all required
 # dependencies to build and compile java chaincode
 FROM ${JAVA_IMAGE}
 
 RUN apt-get update \
-    && apt-get -y install zip unzip \       
+    && apt-get install -y zip unzip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /chaincode/input \
diff --git a/fabric-chaincode-docker/build.gradle b/fabric-chaincode-docker/build.gradle
@@ -59,5 +59,5 @@ tasks.register('copyAllDeps', Copy) {
 tasks.register('buildImage', DockerBuildImage) {
     dependsOn copyAllDeps
     inputDir = project.file('Dockerfile').parentFile
-    images = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:amd64-2.5.8', 'hyperledger/fabric-javaenv:amd64-latest']
+    images = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:2.5.8']
 }
diff --git a/fabric-chaincode-shim/build.gradle b/fabric-chaincode-shim/build.gradle
@@ -78,10 +78,6 @@ sourceSets {
 
 }
 
-jacoco {
-    toolVersion = "0.8.12"
-}
-
 jacocoTestReport {
     afterEvaluate {
         classDirectories.from = files(classDirectories.files.collect {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ subprojects {`
`72`	`72`	`spotless {`
`73`	`73`	`java {`
`74`	`74`	`removeUnusedImports()`
`75`		`- palantirJavaFormat('2.67.0').formatJavadoc(true)`
	`75`	`+ palantirJavaFormat().formatJavadoc(true)`
`76`	`76`	`formatAnnotations()`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,5 @@ tasks.register('copyAllDeps', Copy) {`
`59`	`59`	`tasks.register('buildImage', DockerBuildImage) {`
`60`	`60`	`dependsOn copyAllDeps`
`61`	`61`	`inputDir = project.file('Dockerfile').parentFile`
`62`		`- images = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:amd64-2.5.8', 'hyperledger/fabric-javaenv:amd64-latest']`
	`62`	`+ images = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:2.5', 'hyperledger/fabric-javaenv:2.5.8']`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,6 @@ sourceSets {`
`78`	`78`
`79`	`79`	`}`
`80`	`80`
`81`		`-jacoco {`
`82`		`- toolVersion = "0.8.12"`
`83`		`-}`
`84`		`-`
`85`	`81`	`jacocoTestReport {`
`86`	`82`	`afterEvaluate {`
`87`	`83`	`classDirectories.from = files(classDirectories.files.collect {`