Support Java 25 (#1352)

- Update Gradle to 9.1.0.
- Update shadow plugin to 9.2.2.
- Requires a minimum of Java 17 to run Gradle.
- Chaincode and applications still target Java 11.
- Use release option instead of Gradle toolchain since the toolchain
  download can cause issues when building Docker images.

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

Author: bestbeforetoday

.github/actions/test-network-setup/action.yaml

@@ -9,7 +9,7 @@ inputs:
     default: 20.x
   java-version:
     description: Version of JDK
-    default: 11.x
+    default: 25.x
   fabric-version:
     description: Version of Hyperledger Fabric
     default: 2.5.13

.github/workflows/lint.yaml

@@ -18,7 +18,7 @@ concurrency:
 env:
   GO_VER: "1.23"
   NODE_VER: 20.x
-  JAVA_VER: 11.x
+  JAVA_VER: 25.x
 
 jobs:
   go:

asset-transfer-basic/application-gateway-java/build.gradle

@@ -27,10 +27,8 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.11.0'
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+compileJava {
+    options.release = 11
 }
 
 application {

asset-transfer-basic/application-gateway-java/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

asset-transfer-basic/application-gateway-java/gradle/wrapper/gradle-wrapper.properties

@@ -1,30 +1,30 @@
-# the first stage 
-FROM gradle:8.6-jdk11 AS GRADLE_BUILD
+# the first stage
+FROM gradle:9-jdk25 AS gradle_build
 
 # copy the build.gradle and src code to the container
 COPY src/ src/
-COPY build.gradle ./ 
+COPY build.gradle ./
 
 # Build and package our code
 RUN gradle --no-daemon build shadowJar -x checkstyleMain -x checkstyleTest
 
 
 # the second stage of our build just needs the compiled files
-FROM openjdk:11-jre
+FROM eclipse-temurin:25-jre
 ARG CC_SERVER_PORT=9999
 
 # Setup tini to work better handle signals
-ENV TINI_VERSION v0.19.0
+ENV TINI_VERSION=v0.19.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 RUN addgroup --system javauser && useradd -g javauser javauser
 
 # copy only the artifacts we need from the first stage and discard the rest
-COPY --chown=javauser:javauser --from=GRADLE_BUILD /home/gradle/build/libs/chaincode.jar /chaincode.jar
-COPY --chown=javauser:javauser docker/docker-entrypoint.sh /docker-entrypoint.sh 
+COPY --chown=javauser:javauser --from=gradle_build /home/gradle/build/libs/chaincode.jar /chaincode.jar
+COPY --chown=javauser:javauser docker/docker-entrypoint.sh /docker-entrypoint.sh
 
-ENV PORT $CC_SERVER_PORT
+ENV PORT=$CC_SERVER_PORT
 EXPOSE $CC_SERVER_PORT
 
 USER javauser

asset-transfer-basic/application-gateway-java/gradlew

@@ -3,7 +3,7 @@
  */
 
 plugins {
-    id 'com.gradleup.shadow' version '8.3.5'
+    id 'com.gradleup.shadow' version '9.2.2'
     id 'application'
     id 'checkstyle'
     id 'jacoco'
@@ -13,13 +13,14 @@ group 'org.hyperledger.fabric.samples'
 version '1.0-SNAPSHOT'
 
 dependencies {
-
     implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+'
     implementation 'org.json:json:+'
     implementation 'com.owlike:genson:1.6'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
-    testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation 'org.mockito:mockito-core:5.12.0'
+    testImplementation platform('org.junit:junit-bom:5.14.0')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.assertj:assertj-core:3.27.6'
+    testImplementation 'org.mockito:mockito-core:5.20.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 repositories {
@@ -29,10 +30,8 @@ repositories {
     }
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
+compileJava {
+    options.release = 11
 }
 
 application {
@@ -75,12 +74,12 @@ test {
     }
 }
 
-mainClassName = 'org.hyperledger.fabric.contract.ContractRouter'
-
 shadowJar {
     archiveBaseName = 'chaincode'
     archiveVersion = ''
     archiveClassifier = ''
+
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     mergeServiceFiles()
 
     manifest {