epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-17 15:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FAB-13126] Align fabric-samples with 1.4.0-rc1 release

Browse source 
Change-Id: I2ff248e93cbac8747c322672f7a831ece597e116
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
David Enyeart 2018-12-11 22:34:49 -05:00
parent 445ccbc25a
commit 6a7472e72e
20 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -13,7 +13,7 @@ The [`scripts/bootstrap.sh`](https://github.com/hyperledger/fabric-samples/blob/
script will preload all of the requisite docker script will preload all of the requisite docker
images for Hyperledger Fabric and tag them with the 'latest' tag. Optionally, images for Hyperledger Fabric and tag them with the 'latest' tag. Optionally,
specify a version for fabric, fabric-ca and thirdparty images. Default versions specify a version for fabric, fabric-ca and thirdparty images. Default versions
are 1.3.0, 1.3.0 and 0.4.13 respectively. are 1.4.0-rc1, 1.4.0-rc1 and 0.4.14 respectively.
```bash ```bash
./scripts/bootstrap.sh [version] [ca version] [thirdparty_version] ./scripts/bootstrap.sh [version] [ca version] [thirdparty_version]

2
balance-transfer/artifacts/src/github.com/example_cc/node/package.json
View file

@ -10,6 +10,6 @@
"engine-strict": true, "engine-strict": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-shim": "unstable" "fabric-shim": "1.4.0-rc1"
} }
} }

4
balance-transfer/package.json
View file

@ -24,8 +24,8 @@
"express-bearer-token": "^2.1.0", "express-bearer-token": "^2.1.0",
"express-jwt": "^5.1.0", "express-jwt": "^5.1.0",
"express-session": "^1.15.2", "express-session": "^1.15.2",
"fabric-ca-client": "unstable", "fabric-ca-client": "1.4.0-rc2",
"fabric-client": "unstable", "fabric-client": "1.4.0-rc2",
"fs-extra": "^2.0.0", "fs-extra": "^2.0.0",
"jsonwebtoken": "^7.3.0", "jsonwebtoken": "^7.3.0",
"log4js": "^0.6.38" "log4js": "^0.6.38"

4
balance-transfer/typescript/package.json
View file

@ -30,8 +30,8 @@
"express": "^4.16.1", "express": "^4.16.1",
"express-jwt": "^5.3.0", "express-jwt": "^5.3.0",
"express-session": "^1.15.6", "express-session": "^1.15.6",
"fabric-ca-client": "^1.0.2", "fabric-ca-client": "1.4.0-rc2",
"fabric-client": "^1.0.2", "fabric-client": "1.4.0-rc2",
"log4js": "^0.6.38" "log4js": "^0.6.38"
} }
} }

2
chaincode/chaincode_example02/node/package.json
View file

@ -10,6 +10,6 @@
"engine-strict": true, "engine-strict": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-shim": "unstable" "fabric-shim": "1.4.0-rc1"
} }
} }

2
chaincode/fabcar/javascript-low-level/package.json
View file

@ -12,6 +12,6 @@
"engine-strict": true, "engine-strict": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-shim": "unstable" "fabric-shim": "1.4.0-rc1"
} }
} }

4
chaincode/fabcar/javascript/package.json
View file

@ -17,8 +17,8 @@
"author": "Hyperledger", "author": "Hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-contract-api": "1.4.0-beta", "fabric-contract-api": "1.4.0-rc1",
"fabric-shim": "1.4.0-beta" "fabric-shim": "1.4.0-rc1"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.1.2", "chai": "^4.1.2",

4
chaincode/fabcar/typescript/package.json
View file

@ -21,8 +21,8 @@
"author": "Hyperledger", "author": "Hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-contract-api": "1.4.0-snapshot.42", "fabric-contract-api": "1.4.0-rc1",
"fabric-shim": "1.4.0-snapshot.52" "fabric-shim": "1.4.0-rc1"
}, },
"devDependencies": { "devDependencies": {
"@types/chai": "^4.1.7", "@types/chai": "^4.1.7",

2
chaincode/marbles02/node/package.json
View file

@ -10,6 +10,6 @@
"engine-strict": true, "engine-strict": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-shim": "unstable" "fabric-shim": "1.4.0-rc1"
} }
} }

4
commercial-paper/organization/digibank/application/package.json
View file

@ -10,8 +10,8 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"fabric-network": "^1.4.0-beta", "fabric-network": "1.4.0-rc2",
"fabric-client": "^1.4.0-beta", "fabric-client": "1.4.0-rc2",
"js-yaml": "^3.12.0" "js-yaml": "^3.12.0"
}, },
"devDependencies": { "devDependencies": {

4
commercial-paper/organization/digibank/contract/package.json
View file

@ -18,8 +18,8 @@
"author": "hyperledger", "author": "hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-contract-api": "^1.4.0-snapshot.17", "fabric-contract-api": "1.4.0-rc1",
"fabric-shim": "^1.4.0-snapshot.27" "fabric-shim": "1.4.0-rc1"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.1.2", "chai": "^4.1.2",

4
commercial-paper/organization/magnetocorp/application/package.json
View file

@ -10,8 +10,8 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"fabric-network": "^1.4.0-beta", "fabric-network": "1.4.0-rc2",
"fabric-client": "^1.4.0-beta", "fabric-client": "1.4.0-rc2",
"js-yaml": "^3.12.0" "js-yaml": "^3.12.0"
}, },
"devDependencies": { "devDependencies": {

4
commercial-paper/organization/magnetocorp/contract/package.json
View file

@ -18,8 +18,8 @@
"author": "hyperledger", "author": "hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-contract-api": "^1.4.0-snapshot.17", "fabric-contract-api": "1.4.0-rc1",
"fabric-shim": "^1.4.0-snapshot.27" "fabric-shim": "1.4.0-rc1"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.1.2", "chai": "^4.1.2",

4
fabcar/javascript-low-level/package.json
View file

@ -7,8 +7,8 @@
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"dependencies": { "dependencies": {
"fabric-ca-client": "unstable", "fabric-ca-client": "1.4.0-rc2",
"fabric-client": "unstable", "fabric-client": "1.4.0-rc2",
"grpc": "^1.6.0" "grpc": "^1.6.0"
}, },
"author": "Anthony O'Dowd", "author": "Anthony O'Dowd",

4
fabcar/javascript/package.json
View file

@ -15,8 +15,8 @@
"author": "Hyperledger", "author": "Hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-ca-client": "unstable", "fabric-ca-client": "1.4.0-rc2",
"fabric-network": "unstable" "fabric-network": "1.4.0-rc2"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.2.0", "chai": "^4.2.0",

4
fabcar/typescript/package.json
View file

@ -18,8 +18,8 @@
"author": "Hyperledger", "author": "Hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-ca-client": "unstable", "fabric-ca-client": "1.4.0-rc2",
"fabric-network": "unstable" "fabric-network": "1.4.0-rc2"
}, },
"devDependencies": { "devDependencies": {
"@types/chai": "^4.1.7", "@types/chai": "^4.1.7",

4
fabric-ca/README.md
View file

@ -27,8 +27,8 @@ an older released version, or from locally built docker images as follows:
and Fabric CA. and Fabric CA.
b. Older versions of Fabric and Fabric CA can be used by setting the b. Older versions of Fabric and Fabric CA can be used by setting the
`FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.3.0` `FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.4.0-rc1`
will run the sample with 1.3.0 version of Fabric and Fabric CA. will run the sample with 1.4.0-rc1 version of Fabric and Fabric CA.
c. The sample can also be run with locally built Fabric and Fabric CA c. The sample can also be run with locally built Fabric and Fabric CA
docker images. Fabric and Fabric CA repositories must be cloned with following docker images. Fabric and Fabric CA repositories must be cloned with following

2
fabric-ca/makeDocker.sh
View file

@ -12,7 +12,7 @@
# IMPORTANT: The following default FABRIC_TAG value should be updated for each # IMPORTANT: The following default FABRIC_TAG value should be updated for each
# release after the fabric-orderer and fabric-peer images have been published # release after the fabric-orderer and fabric-peer images have been published
# for the release. # for the release.
export FABRIC_TAG=${FABRIC_TAG:-1.3.0} export FABRIC_TAG=${FABRIC_TAG:-1.4.0-rc1}
export FABRIC_CA_TAG=${FABRIC_CA_TAG:-${FABRIC_TAG}} export FABRIC_CA_TAG=${FABRIC_CA_TAG:-${FABRIC_TAG}}
export NS=${NS:-hyperledger} export NS=${NS:-hyperledger}

2
fabric-ca/start.sh
View file

@ -11,7 +11,7 @@
# By default, this test is run with the latest released docker images. # By default, this test is run with the latest released docker images.
# #
# To run against a specific fabric/fabric-ca version: # To run against a specific fabric/fabric-ca version:
# export FABRIC_TAG=1.3.0 # export FABRIC_TAG=1.4.0-rc1
# #
# To run with locally built images: # To run with locally built images:
# export FABRIC_TAG=local # export FABRIC_TAG=local

8
scripts/bootstrap.sh
View file

@ -6,11 +6,11 @@
# #
# if version not passed in, default to latest released version # if version not passed in, default to latest released version
export VERSION=1.3.0 export VERSION=1.4.0-rc1
# if ca version not passed in, default to latest released version # if ca version not passed in, default to latest released version
export CA_VERSION=$VERSION export CA_VERSION=$VERSION
# current version of thirdparty images (couchdb, kafka and zookeeper) released # current version of thirdparty images (couchdb, kafka and zookeeper) released
export THIRDPARTY_IMAGE_VERSION=0.4.13 export THIRDPARTY_IMAGE_VERSION=0.4.14
export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')") export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')")
export MARCH=$(uname -m) export MARCH=$(uname -m)
@ -32,8 +32,8 @@ printHelp() {
echo "-d - bypass docker image download" echo "-d - bypass docker image download"
echo "-b - bypass download of platform-specific binaries" echo "-b - bypass download of platform-specific binaries"
echo echo
echo "e.g. bootstrap.sh 1.3.0 1.3.0 0.4.13" echo "e.g. bootstrap.sh 1.4.0-rc1 1.4.0-rc1 0.4.14"
echo "would download docker images and binaries for version 1.3.0 (fabric) 1.3.0 (fabric-ca) 0.4.13 (thirdparty)" echo "would download docker images and binaries for version 1.4.0-rc1 (fabric) 1.4.0-rc1 (fabric-ca) 0.4.14 (thirdparty)"
} }
dockerFabricPull() { dockerFabricPull() {