From 6a7472e72ee9c3f97d7f91f93f21fc27b237d2f1 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Tue, 11 Dec 2018 22:34:49 -0500 Subject: [PATCH] [FAB-13126] Align fabric-samples with 1.4.0-rc1 release Change-Id: I2ff248e93cbac8747c322672f7a831ece597e116 Signed-off-by: David Enyeart --- README.md | 2 +- .../artifacts/src/github.com/example_cc/node/package.json | 2 +- balance-transfer/package.json | 4 ++-- balance-transfer/typescript/package.json | 4 ++-- chaincode/chaincode_example02/node/package.json | 2 +- chaincode/fabcar/javascript-low-level/package.json | 2 +- chaincode/fabcar/javascript/package.json | 4 ++-- chaincode/fabcar/typescript/package.json | 4 ++-- chaincode/marbles02/node/package.json | 2 +- .../organization/digibank/application/package.json | 4 ++-- .../organization/digibank/contract/package.json | 4 ++-- .../organization/magnetocorp/application/package.json | 4 ++-- .../organization/magnetocorp/contract/package.json | 4 ++-- fabcar/javascript-low-level/package.json | 4 ++-- fabcar/javascript/package.json | 4 ++-- fabcar/typescript/package.json | 4 ++-- fabric-ca/README.md | 4 ++-- fabric-ca/makeDocker.sh | 2 +- fabric-ca/start.sh | 2 +- scripts/bootstrap.sh | 8 ++++---- 20 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 918a133d..6fe0be17 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The [`scripts/bootstrap.sh`](https://github.com/hyperledger/fabric-samples/blob/ script will preload all of the requisite docker images for Hyperledger Fabric and tag them with the 'latest' tag. Optionally, 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 ./scripts/bootstrap.sh [version] [ca version] [thirdparty_version] diff --git a/balance-transfer/artifacts/src/github.com/example_cc/node/package.json b/balance-transfer/artifacts/src/github.com/example_cc/node/package.json index c7724458..d6fc15a6 100644 --- a/balance-transfer/artifacts/src/github.com/example_cc/node/package.json +++ b/balance-transfer/artifacts/src/github.com/example_cc/node/package.json @@ -10,6 +10,6 @@ "engine-strict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "unstable" + "fabric-shim": "1.4.0-rc1" } } diff --git a/balance-transfer/package.json b/balance-transfer/package.json index fa51c95d..b64f5188 100644 --- a/balance-transfer/package.json +++ b/balance-transfer/package.json @@ -24,8 +24,8 @@ "express-bearer-token": "^2.1.0", "express-jwt": "^5.1.0", "express-session": "^1.15.2", - "fabric-ca-client": "unstable", - "fabric-client": "unstable", + "fabric-ca-client": "1.4.0-rc2", + "fabric-client": "1.4.0-rc2", "fs-extra": "^2.0.0", "jsonwebtoken": "^7.3.0", "log4js": "^0.6.38" diff --git a/balance-transfer/typescript/package.json b/balance-transfer/typescript/package.json index 69a65369..eae7909b 100644 --- a/balance-transfer/typescript/package.json +++ b/balance-transfer/typescript/package.json @@ -30,8 +30,8 @@ "express": "^4.16.1", "express-jwt": "^5.3.0", "express-session": "^1.15.6", - "fabric-ca-client": "^1.0.2", - "fabric-client": "^1.0.2", + "fabric-ca-client": "1.4.0-rc2", + "fabric-client": "1.4.0-rc2", "log4js": "^0.6.38" } } diff --git a/chaincode/chaincode_example02/node/package.json b/chaincode/chaincode_example02/node/package.json index 2dbefae2..5f08fe85 100644 --- a/chaincode/chaincode_example02/node/package.json +++ b/chaincode/chaincode_example02/node/package.json @@ -10,6 +10,6 @@ "engine-strict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "unstable" + "fabric-shim": "1.4.0-rc1" } } diff --git a/chaincode/fabcar/javascript-low-level/package.json b/chaincode/fabcar/javascript-low-level/package.json index 92ba3d64..9af96fa3 100644 --- a/chaincode/fabcar/javascript-low-level/package.json +++ b/chaincode/fabcar/javascript-low-level/package.json @@ -12,6 +12,6 @@ "engine-strict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "unstable" + "fabric-shim": "1.4.0-rc1" } } diff --git a/chaincode/fabcar/javascript/package.json b/chaincode/fabcar/javascript/package.json index 2f9b98fb..86164adf 100644 --- a/chaincode/fabcar/javascript/package.json +++ b/chaincode/fabcar/javascript/package.json @@ -17,8 +17,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "1.4.0-beta", - "fabric-shim": "1.4.0-beta" + "fabric-contract-api": "1.4.0-rc1", + "fabric-shim": "1.4.0-rc1" }, "devDependencies": { "chai": "^4.1.2", diff --git a/chaincode/fabcar/typescript/package.json b/chaincode/fabcar/typescript/package.json index 248182e3..ef7b90c1 100644 --- a/chaincode/fabcar/typescript/package.json +++ b/chaincode/fabcar/typescript/package.json @@ -21,8 +21,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "1.4.0-snapshot.42", - "fabric-shim": "1.4.0-snapshot.52" + "fabric-contract-api": "1.4.0-rc1", + "fabric-shim": "1.4.0-rc1" }, "devDependencies": { "@types/chai": "^4.1.7", diff --git a/chaincode/marbles02/node/package.json b/chaincode/marbles02/node/package.json index a622f00e..8cc03eae 100644 --- a/chaincode/marbles02/node/package.json +++ b/chaincode/marbles02/node/package.json @@ -10,6 +10,6 @@ "engine-strict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "unstable" + "fabric-shim": "1.4.0-rc1" } } diff --git a/commercial-paper/organization/digibank/application/package.json b/commercial-paper/organization/digibank/application/package.json index b31c669a..f80b527c 100644 --- a/commercial-paper/organization/digibank/application/package.json +++ b/commercial-paper/organization/digibank/application/package.json @@ -10,8 +10,8 @@ "author": "", "license": "ISC", "dependencies": { - "fabric-network": "^1.4.0-beta", - "fabric-client": "^1.4.0-beta", + "fabric-network": "1.4.0-rc2", + "fabric-client": "1.4.0-rc2", "js-yaml": "^3.12.0" }, "devDependencies": { diff --git a/commercial-paper/organization/digibank/contract/package.json b/commercial-paper/organization/digibank/contract/package.json index 6d79d096..0d838f75 100644 --- a/commercial-paper/organization/digibank/contract/package.json +++ b/commercial-paper/organization/digibank/contract/package.json @@ -18,8 +18,8 @@ "author": "hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "^1.4.0-snapshot.17", - "fabric-shim": "^1.4.0-snapshot.27" + "fabric-contract-api": "1.4.0-rc1", + "fabric-shim": "1.4.0-rc1" }, "devDependencies": { "chai": "^4.1.2", diff --git a/commercial-paper/organization/magnetocorp/application/package.json b/commercial-paper/organization/magnetocorp/application/package.json index 2ed92f26..a151f448 100644 --- a/commercial-paper/organization/magnetocorp/application/package.json +++ b/commercial-paper/organization/magnetocorp/application/package.json @@ -10,8 +10,8 @@ "author": "", "license": "ISC", "dependencies": { - "fabric-network": "^1.4.0-beta", - "fabric-client": "^1.4.0-beta", + "fabric-network": "1.4.0-rc2", + "fabric-client": "1.4.0-rc2", "js-yaml": "^3.12.0" }, "devDependencies": { diff --git a/commercial-paper/organization/magnetocorp/contract/package.json b/commercial-paper/organization/magnetocorp/contract/package.json index 6d79d096..0d838f75 100644 --- a/commercial-paper/organization/magnetocorp/contract/package.json +++ b/commercial-paper/organization/magnetocorp/contract/package.json @@ -18,8 +18,8 @@ "author": "hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "^1.4.0-snapshot.17", - "fabric-shim": "^1.4.0-snapshot.27" + "fabric-contract-api": "1.4.0-rc1", + "fabric-shim": "1.4.0-rc1" }, "devDependencies": { "chai": "^4.1.2", diff --git a/fabcar/javascript-low-level/package.json b/fabcar/javascript-low-level/package.json index 794c5311..c060897f 100644 --- a/fabcar/javascript-low-level/package.json +++ b/fabcar/javascript-low-level/package.json @@ -7,8 +7,8 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "fabric-ca-client": "unstable", - "fabric-client": "unstable", + "fabric-ca-client": "1.4.0-rc2", + "fabric-client": "1.4.0-rc2", "grpc": "^1.6.0" }, "author": "Anthony O'Dowd", diff --git a/fabcar/javascript/package.json b/fabcar/javascript/package.json index d5e7e9f7..2c00af95 100644 --- a/fabcar/javascript/package.json +++ b/fabcar/javascript/package.json @@ -15,8 +15,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-ca-client": "unstable", - "fabric-network": "unstable" + "fabric-ca-client": "1.4.0-rc2", + "fabric-network": "1.4.0-rc2" }, "devDependencies": { "chai": "^4.2.0", diff --git a/fabcar/typescript/package.json b/fabcar/typescript/package.json index b85c8dab..bc140125 100644 --- a/fabcar/typescript/package.json +++ b/fabcar/typescript/package.json @@ -18,8 +18,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-ca-client": "unstable", - "fabric-network": "unstable" + "fabric-ca-client": "1.4.0-rc2", + "fabric-network": "1.4.0-rc2" }, "devDependencies": { "@types/chai": "^4.1.7", diff --git a/fabric-ca/README.md b/fabric-ca/README.md index dad58682..458a7a5d 100755 --- a/fabric-ca/README.md +++ b/fabric-ca/README.md @@ -27,8 +27,8 @@ an older released version, or from locally built docker images as follows: and Fabric CA. 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` - will run the sample with 1.3.0 version of Fabric and Fabric CA. + `FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.4.0-rc1` + 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 docker images. Fabric and Fabric CA repositories must be cloned with following diff --git a/fabric-ca/makeDocker.sh b/fabric-ca/makeDocker.sh index 3019b871..371b12e2 100755 --- a/fabric-ca/makeDocker.sh +++ b/fabric-ca/makeDocker.sh @@ -12,7 +12,7 @@ # IMPORTANT: The following default FABRIC_TAG value should be updated for each # release after the fabric-orderer and fabric-peer images have been published # 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 NS=${NS:-hyperledger} diff --git a/fabric-ca/start.sh b/fabric-ca/start.sh index 13e994c6..083a5577 100755 --- a/fabric-ca/start.sh +++ b/fabric-ca/start.sh @@ -11,7 +11,7 @@ # By default, this test is run with the latest released docker images. # # 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: # export FABRIC_TAG=local diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b36db883..19440692 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -6,11 +6,11 @@ # # 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 export CA_VERSION=$VERSION # 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 MARCH=$(uname -m) @@ -32,8 +32,8 @@ printHelp() { echo "-d - bypass docker image download" echo "-b - bypass download of platform-specific binaries" echo - echo "e.g. bootstrap.sh 1.3.0 1.3.0 0.4.13" - echo "would download docker images and binaries for version 1.3.0 (fabric) 1.3.0 (fabric-ca) 0.4.13 (thirdparty)" + 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.4.0-rc1 (fabric) 1.4.0-rc1 (fabric-ca) 0.4.14 (thirdparty)" } dockerFabricPull() {