From 0619bfe42728a51e776aac96ab2ee32850133b19 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Mon, 1 May 2023 15:49:31 -0400 Subject: [PATCH] Update to Fabric v2.5 Update samples to use Fabric v2.5 artifacts. Signed-off-by: David Enyeart --- .github/actions/fsat-setup/action.yaml | 2 +- .github/actions/test-network-setup/action.yaml | 4 ++-- asset-transfer-basic/chaincode-java/build.gradle | 6 +++--- asset-transfer-events/chaincode-java/build.gradle | 6 +++--- asset-transfer-private-data/chaincode-java/build.gradle | 6 +++--- asset-transfer-sbe/chaincode-java/build.gradle | 6 +++--- test-network-k8s/network | 2 +- token-erc-20/chaincode-java/build.gradle | 6 +++--- token-erc-721/chaincode-java/build.gradle | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index a79ca135..4adb50b8 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -12,7 +12,7 @@ inputs: default: v0.25.3 fabric-version: description: Version of Hyperledger Fabric - default: '2.5.0' + default: '2.5.1' ca-version: description: Version of Hyperledger Fabric CA default: '1.5.6' diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index 0f801849..eb4eb392 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -12,10 +12,10 @@ inputs: default: 11.x fabric-version: description: Version of Hyperledger Fabric - default: 2.5.0-beta2 + default: 2.5.1 ca-version: description: Version of Hyperledger Fabric CA - default: 1.5.6-beta3 + default: 1.5.6 runs: using: "composite" diff --git a/asset-transfer-basic/chaincode-java/build.gradle b/asset-transfer-basic/chaincode-java/build.gradle index ba6d051b..51e64fee 100644 --- a/asset-transfer-basic/chaincode-java/build.gradle +++ b/asset-transfer-basic/chaincode-java/build.gradle @@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' implementation 'org.json:json:+' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' diff --git a/asset-transfer-events/chaincode-java/build.gradle b/asset-transfer-events/chaincode-java/build.gradle index 839dd2ea..0fbd12a4 100644 --- a/asset-transfer-events/chaincode-java/build.gradle +++ b/asset-transfer-events/chaincode-java/build.gradle @@ -13,9 +13,9 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' implementation 'org.json:json:+' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' } repositories { @@ -59,4 +59,4 @@ shadowJar { } } -installDist.dependsOn check \ No newline at end of file +installDist.dependsOn check diff --git a/asset-transfer-private-data/chaincode-java/build.gradle b/asset-transfer-private-data/chaincode-java/build.gradle index e5acd742..2d0ad68c 100644 --- a/asset-transfer-private-data/chaincode-java/build.gradle +++ b/asset-transfer-private-data/chaincode-java/build.gradle @@ -13,11 +13,11 @@ 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:+' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' @@ -70,4 +70,4 @@ shadowJar { } } -installDist.dependsOn check \ No newline at end of file +installDist.dependsOn check diff --git a/asset-transfer-sbe/chaincode-java/build.gradle b/asset-transfer-sbe/chaincode-java/build.gradle index 899d403f..8849eb69 100644 --- a/asset-transfer-sbe/chaincode-java/build.gradle +++ b/asset-transfer-sbe/chaincode-java/build.gradle @@ -13,14 +13,14 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' implementation 'org.json:json:+' implementation 'com.google.protobuf:protobuf-java:3.+' implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-protos:2.4.1' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' diff --git a/test-network-k8s/network b/test-network-k8s/network index 20ee8595..e1582fe8 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -28,7 +28,7 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.4 +context FABRIC_VERSION 2.5 context FABRIC_CA_VERSION 1.5 context CLUSTER_RUNTIME kind # or k3s for Rancher diff --git a/token-erc-20/chaincode-java/build.gradle b/token-erc-20/chaincode-java/build.gradle index 518d6f8b..43fc5a5f 100755 --- a/token-erc-20/chaincode-java/build.gradle +++ b/token-erc-20/chaincode-java/build.gradle @@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' implementation 'org.json:json:+' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' diff --git a/token-erc-721/chaincode-java/build.gradle b/token-erc-721/chaincode-java/build.gradle index dd0f5c41..05181710 100755 --- a/token-erc-721/chaincode-java/build.gradle +++ b/token-erc-721/chaincode-java/build.gradle @@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - - implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' implementation 'org.json:json:+' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.4.1' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.23.4'