From 137327a0099e4e462d3c1de9c22eaa0403578bea Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Tue, 12 Feb 2019 11:41:46 -0500 Subject: [PATCH] [FAB-14162] Pin fabric-samples in master to "unstable" Pin fabric-samples in master to "unstable" so that latest node modules get used by default. Change-Id: I36df30cb108a350c8e59756ed0d2f03610eb1d73 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/abstore/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 | 5 ++--- fabcar/javascript/package.json | 4 ++-- fabcar/typescript/package.json | 4 ++-- scripts/bootstrap.sh | 6 +++--- 17 files changed, 30 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 13617f7586..3946e594a3 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.4.0-rc2, 1.4.0-rc2 and 0.4.14 respectively. +are 1.4.0, 1.4.0 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 77a9f7e1d8..c7724458f5 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": "1.4.0-rc2" + "fabric-shim": "unstable" } } diff --git a/balance-transfer/package.json b/balance-transfer/package.json index b64f51889d..fa51c95d6d 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": "1.4.0-rc2", - "fabric-client": "1.4.0-rc2", + "fabric-ca-client": "unstable", + "fabric-client": "unstable", "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 eae7909bb1..aad1914884 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.4.0-rc2", - "fabric-client": "1.4.0-rc2", + "fabric-ca-client": "unstable", + "fabric-client": "unstable", "log4js": "^0.6.38" } } diff --git a/chaincode/abstore/node/package.json b/chaincode/abstore/node/package.json index e38c4e0728..60d809bb65 100644 --- a/chaincode/abstore/node/package.json +++ b/chaincode/abstore/node/package.json @@ -12,6 +12,6 @@ "engine-strict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "1.4.0-rc2" + "fabric-shim": "unstable" } } diff --git a/chaincode/fabcar/javascript-low-level/package.json b/chaincode/fabcar/javascript-low-level/package.json index 8a690e5794..92ba3d648e 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": "1.4.0-rc2" + "fabric-shim": "unstable" } } diff --git a/chaincode/fabcar/javascript/package.json b/chaincode/fabcar/javascript/package.json index 618dd49fc1..79caa7076b 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-rc2", - "fabric-shim": "1.4.0-rc2" + "fabric-contract-api": "unstable", + "fabric-shim": "unstable" }, "devDependencies": { "chai": "^4.1.2", diff --git a/chaincode/fabcar/typescript/package.json b/chaincode/fabcar/typescript/package.json index 91663dd4a8..92ac183fc4 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-rc2", - "fabric-shim": "1.4.0-rc2" + "fabric-contract-api": "unstable", + "fabric-shim": "unstable" }, "devDependencies": { "@types/chai": "^4.1.7", diff --git a/chaincode/marbles02/node/package.json b/chaincode/marbles02/node/package.json index a4c202eb7e..a622f00ecd 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": "1.4.0-rc2" + "fabric-shim": "unstable" } } diff --git a/commercial-paper/organization/digibank/application/package.json b/commercial-paper/organization/digibank/application/package.json index f80b527c42..ec809bc801 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-rc2", - "fabric-client": "1.4.0-rc2", + "fabric-network": "unstable", + "fabric-client": "unstable", "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 816ea44a0b..e94e7033af 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-rc2", - "fabric-shim": "1.4.0-rc2" + "fabric-contract-api": "unstable", + "fabric-shim": "unstable" }, "devDependencies": { "chai": "^4.1.2", diff --git a/commercial-paper/organization/magnetocorp/application/package.json b/commercial-paper/organization/magnetocorp/application/package.json index a151f44801..095bdb96dc 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-rc2", - "fabric-client": "1.4.0-rc2", + "fabric-network": "unstable", + "fabric-client": "unstable", "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 816ea44a0b..e94e7033af 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-rc2", - "fabric-shim": "1.4.0-rc2" + "fabric-contract-api": "unstable", + "fabric-shim": "unstable" }, "devDependencies": { "chai": "^4.1.2", diff --git a/fabcar/javascript-low-level/package.json b/fabcar/javascript-low-level/package.json index c060897f93..481773ab0f 100644 --- a/fabcar/javascript-low-level/package.json +++ b/fabcar/javascript-low-level/package.json @@ -7,9 +7,8 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "fabric-ca-client": "1.4.0-rc2", - "fabric-client": "1.4.0-rc2", - "grpc": "^1.6.0" + "fabric-ca-client": "unstable", + "fabric-client": "unstable" }, "author": "Anthony O'Dowd", "license": "Apache-2.0", diff --git a/fabcar/javascript/package.json b/fabcar/javascript/package.json index 2c00af9559..d5e7e9f770 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": "1.4.0-rc2", - "fabric-network": "1.4.0-rc2" + "fabric-ca-client": "unstable", + "fabric-network": "unstable" }, "devDependencies": { "chai": "^4.2.0", diff --git a/fabcar/typescript/package.json b/fabcar/typescript/package.json index bc14012592..b85c8dabd7 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": "1.4.0-rc2", - "fabric-network": "1.4.0-rc2" + "fabric-ca-client": "unstable", + "fabric-network": "unstable" }, "devDependencies": { "@types/chai": "^4.1.7", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index cd7b184d20..5526213178 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -6,7 +6,7 @@ # # if version not passed in, default to latest released version -export VERSION=1.4.0-rc2 +export VERSION=1.4.0 # 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 @@ -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.4.0-rc2 1.4.0-rc2 0.4.14" - echo "would download docker images and binaries for version 1.4.0-rc2 (fabric) 1.4.0-rc2 (fabric-ca) 0.4.14 (thirdparty)" + echo "e.g. bootstrap.sh 1.4.0 1.4.0 0.4.14" + echo "would download docker images and binaries for version 1.4.0 (fabric) 1.4.0 (fabric-ca) 0.4.14 (thirdparty)" } dockerFabricPull() {