epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-23 01:55:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Update to Fabric v2.5

Browse source 
Update samples to use Fabric v2.5 artifacts.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
David Enyeart 2023-05-01 15:49:31 -04:00
parent 74c48ec5aa
commit 0619bfe427
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/actions/fsat-setup/action.yaml vendored
View file

@ -12,7 +12,7 @@ inputs:
default: v0.25.3 default: v0.25.3
fabric-version: fabric-version:
description: Version of Hyperledger Fabric description: Version of Hyperledger Fabric
default: '2.5.0' default: '2.5.1'
ca-version: ca-version:
description: Version of Hyperledger Fabric CA description: Version of Hyperledger Fabric CA
default: '1.5.6' default: '1.5.6'

4
.github/actions/test-network-setup/action.yaml vendored
View file

@ -12,10 +12,10 @@ inputs:
default: 11.x default: 11.x
fabric-version: fabric-version:
description: Version of Hyperledger Fabric description: Version of Hyperledger Fabric
default: 2.5.0-beta2 default: 2.5.1
ca-version: ca-version:
description: Version of Hyperledger Fabric CA description: Version of Hyperledger Fabric CA
default: 1.5.6-beta3 default: 1.5.6
runs: runs:
using: "composite" using: "composite"

6
asset-transfer-basic/chaincode-java/build.gradle
View file

@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { 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 'org.json:json:+'
implementation 'com.owlike:genson:1.5' 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.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation 'org.mockito:mockito-core:2.+' testImplementation 'org.mockito:mockito-core:2.+'

6
asset-transfer-events/chaincode-java/build.gradle
View file

@ -13,9 +13,9 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { 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:+' 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 { repositories {
@ -59,4 +59,4 @@ shadowJar {
} }
} }
installDist.dependsOn check installDist.dependsOn check

6
asset-transfer-private-data/chaincode-java/build.gradle
View file

@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { dependencies {
implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+' implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.+'
implementation 'org.json:json:+' 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.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation 'org.mockito:mockito-core:2.+' testImplementation 'org.mockito:mockito-core:2.+'
@ -70,4 +70,4 @@ shadowJar {
} }
} }
installDist.dependsOn check installDist.dependsOn check

6
asset-transfer-sbe/chaincode-java/build.gradle
View file

@ -13,14 +13,14 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { 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 'org.json:json:+'
implementation 'com.google.protobuf:protobuf-java:3.+' implementation 'com.google.protobuf:protobuf-java:3.+'
implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-protos:2.4.1' implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-protos:2.4.1'
implementation 'com.owlike:genson:1.5' 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.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation 'org.mockito:mockito-core:2.+' testImplementation 'org.mockito:mockito-core:2.+'

2
test-network-k8s/network
View file

@ -28,7 +28,7 @@ function context() {
export ${name}="${!override_name:-${default_value}}" export ${name}="${!override_name:-${default_value}}"
} }
context FABRIC_VERSION 2.4 context FABRIC_VERSION 2.5
context FABRIC_CA_VERSION 1.5 context FABRIC_CA_VERSION 1.5
context CLUSTER_RUNTIME kind # or k3s for Rancher context CLUSTER_RUNTIME kind # or k3s for Rancher

6
token-erc-20/chaincode-java/build.gradle
View file

@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { 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 'org.json:json:+'
implementation 'com.owlike:genson:1.5' 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.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation 'org.mockito:mockito-core:2.+' testImplementation 'org.mockito:mockito-core:2.+'

6
token-erc-721/chaincode-java/build.gradle
View file

@ -13,11 +13,11 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { 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 'org.json:json:+'
implementation 'com.owlike:genson:1.5' 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.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation 'org.mockito:mockito-core:2.23.4' testImplementation 'org.mockito:mockito-core:2.23.4'