Skip to content

Commit d67cc31

Browse files
Support Java 25
- 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. Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
1 parent ad19505 commit d67cc31

50 files changed

Lines changed: 145 additions & 132 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inputs:
99
default: 20.x
1010
java-version:
1111
description: Version of JDK
12-
default: 11.x
12+
default: 25.x
1313
fabric-version:
1414
description: Version of Hyperledger Fabric
1515
default: 2.5.13

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818
env:
1919
GO_VER: "1.23"
2020
NODE_VER: 20.x
21-
JAVA_VER: 11.x
21+
JAVA_VER: 25.x
2222

2323
jobs:
2424
go:
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asset-transfer-basic/chaincode-java/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
plugins {
6-
id 'com.gradleup.shadow' version '8.3.5'
6+
id 'com.gradleup.shadow' version '9.2.2'
77
id 'application'
88
id 'checkstyle'
99
id 'jacoco'
@@ -13,13 +13,14 @@ group 'org.hyperledger.fabric.samples'
1313
version '1.0-SNAPSHOT'
1414

1515
dependencies {
16-
1716
implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+'
1817
implementation 'org.json:json:+'
1918
implementation 'com.owlike:genson:1.6'
20-
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
21-
testImplementation 'org.assertj:assertj-core:3.25.3'
22-
testImplementation 'org.mockito:mockito-core:5.12.0'
19+
testImplementation platform('org.junit:junit-bom:5.14.0')
20+
testImplementation 'org.junit.jupiter:junit-jupiter'
21+
testImplementation 'org.assertj:assertj-core:3.27.6'
22+
testImplementation 'org.mockito:mockito-core:5.20.0'
23+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
2324
}
2425

2526
repositories {
@@ -75,12 +76,12 @@ test {
7576
}
7677
}
7778

78-
mainClassName = 'org.hyperledger.fabric.contract.ContractRouter'
79-
8079
shadowJar {
8180
archiveBaseName = 'chaincode'
8281
archiveVersion = ''
8382
archiveClassifier = ''
83+
84+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
8485
mergeServiceFiles()
8586

8687
manifest {
Binary file not shown.

asset-transfer-basic/chaincode-java/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

asset-transfer-basic/chaincode-java/gradlew

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)