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

Merge "[FAB-14162] Pin fabric-samples in master to "unstable""

Browse source
This commit is contained in:
Gari Singh 2019-02-22 13:00:08 +00:00 committed by Gerrit Code Review
commit e6894e82fb
17 changed files with 30 additions and 31 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.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 ```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": "1.4.0-rc2" "fabric-shim": "unstable"
} }
} }

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": "1.4.0-rc2", "fabric-ca-client": "unstable",
"fabric-client": "1.4.0-rc2", "fabric-client": "unstable",
"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.4.0-rc2", "fabric-ca-client": "unstable",
"fabric-client": "1.4.0-rc2", "fabric-client": "unstable",
"log4js": "^0.6.38" "log4js": "^0.6.38"
} }
} }

2
chaincode/abstore/node/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": "1.4.0-rc2" "fabric-shim": "unstable"
} }
} }

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": "1.4.0-rc2" "fabric-shim": "unstable"
} }
} }

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-rc2", "fabric-contract-api": "unstable",
"fabric-shim": "1.4.0-rc2" "fabric-shim": "unstable"
}, },
"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-rc2", "fabric-contract-api": "unstable",
"fabric-shim": "1.4.0-rc2" "fabric-shim": "unstable"
}, },
"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": "1.4.0-rc2" "fabric-shim": "unstable"
} }
} }

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-rc2", "fabric-network": "unstable",
"fabric-client": "1.4.0-rc2", "fabric-client": "unstable",
"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-rc2", "fabric-contract-api": "unstable",
"fabric-shim": "1.4.0-rc2" "fabric-shim": "unstable"
}, },
"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-rc2", "fabric-network": "unstable",
"fabric-client": "1.4.0-rc2", "fabric-client": "unstable",
"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-rc2", "fabric-contract-api": "unstable",
"fabric-shim": "1.4.0-rc2" "fabric-shim": "unstable"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.1.2", "chai": "^4.1.2",

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

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

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": "1.4.0-rc2", "fabric-ca-client": "unstable",
"fabric-network": "1.4.0-rc2" "fabric-network": "unstable"
}, },
"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": "1.4.0-rc2", "fabric-ca-client": "unstable",
"fabric-network": "1.4.0-rc2" "fabric-network": "unstable"
}, },
"devDependencies": { "devDependencies": {
"@types/chai": "^4.1.7", "@types/chai": "^4.1.7",

6
scripts/bootstrap.sh
View file

@ -6,7 +6,7 @@
# #
# if version not passed in, default to latest released version # 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 # 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
@ -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.4.0-rc2 1.4.0-rc2 0.4.14" 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-rc2 (fabric) 1.4.0-rc2 (fabric-ca) 0.4.14 (thirdparty)" echo "would download docker images and binaries for version 1.4.0 (fabric) 1.4.0 (fabric-ca) 0.4.14 (thirdparty)"
} }
dockerFabricPull() { dockerFabricPull() {