File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2525 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626 with :
2727 distribution : " temurin"
28- java-version : 21
28+ java-version : 25
2929 - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3030 - name : Publish to GitHub Packages
3131 run : |
4444 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4545 with :
4646 distribution : " temurin"
47- java-version : 21
47+ java-version : 25
4848 - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
4949 - name : Publish to Maven Central
5050 run : |
7575 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
7676 with :
7777 distribution : " temurin"
78- java-version : 21
78+ java-version : 25
7979 - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
8080 - name : Build the dependencies needed for the image
8181 run : ./gradlew :fabric-chaincode-docker:copyAllDeps
Original file line number Diff line number Diff line change 2727 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2828 with :
2929 distribution : temurin
30- java-version : 21
31- - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
30+ java-version : 25
31+ - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3232 - name : Scan
3333 run : make scan
Original file line number Diff line number Diff line change 2222 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2323 with :
2424 distribution : temurin
25- java-version : 21
25+ java-version : 25
2626 - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
2727 - name : Build and Unit test
2828 run : ./gradlew :fabric-chaincode-shim:build
3636 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3737 with :
3838 distribution : temurin
39- java-version : 21
39+ java-version : 25
4040 - uses : actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
4141 with :
4242 node-version : " lts/*"
7272 - uses : actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
7373 with :
7474 distribution : temurin
75- java-version : 21
75+ java-version : 25
7676 - uses : gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
7777 - name : Build Docker image
7878 run : ./gradlew :fabric-chaincode-docker:buildImage
Original file line number Diff line number Diff line change @@ -78,7 +78,7 @@ subprojects {
7878 spotless {
7979 java {
8080 removeUnusedImports()
81- palantirJavaFormat(' 2.67.0 ' ). formatJavadoc(true )
81+ palantirJavaFormat(). formatJavadoc(true )
8282 formatAnnotations()
8383 }
8484 }
Original file line number Diff line number Diff line change 1- ARG JAVA_IMAGE=eclipse-temurin:21 -jdk
1+ ARG JAVA_IMAGE=eclipse-temurin:25 -jdk
22
33FROM ${JAVA_IMAGE} AS builder
44ENV DEBIAN_FRONTEND=noninteractive
@@ -13,7 +13,7 @@ RUN curl -s "https://get.sdkman.io" | bash
1313SHELL ["/bin/bash" , "-c" ]
1414
1515RUN source /root/.sdkman/bin/sdkman-init.sh \
16- && sdk install gradle 8.14.3 \
16+ && sdk install gradle 9.1.0 \
1717 && sdk install maven 3.9.11
1818
1919FROM ${JAVA_IMAGE} AS dependencies
@@ -51,7 +51,7 @@ WORKDIR /root/chaincode-java
5151# Gradle doesn't run without settings.gradle file, so create one
5252RUN touch settings.gradle \
5353 && gradle wrapper \
54- && ./gradlew --version \
54+ && ./gradlew wrapper \
5555 && mvn -N wrapper:wrapper
5656
5757# Creating final javaenv image which will include all required
Original file line number Diff line number Diff line change @@ -78,10 +78,6 @@ sourceSets {
7878
7979}
8080
81- jacoco {
82- toolVersion = " 0.8.12"
83- }
84-
8581jacocoTestReport {
8682 afterEvaluate {
8783 classDirectories. from = files(classDirectories. files. collect {
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionUrl =https\://services.gradle.org/distributions/gradle-8.14.3 -bin.zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-9.1.0 -bin.zip
44networkTimeout =10000
55validateDistributionUrl =true
66zipStoreBase =GRADLE_USER_HOME
You can’t perform that action at this time.
0 commit comments