From 9567985d29f4983a8a7879193b09c71f3ba4fce6 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Thu, 20 Dec 2018 15:26:04 -0500 Subject: [PATCH] [FAB-13407] Align fabric-samples with 1.4.0-rc2 release Change-Id: If784ead9b35c89b874078fe3e87e702fd3be5953 Signed-off-by: David Enyeart --- Jenkinsfile | 2 +- README.md | 2 +- .../artifacts/src/github.com/example_cc/node/package.json | 2 +- 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/contract/package.json | 4 ++-- .../organization/magnetocorp/contract/package.json | 4 ++-- fabric-ca/README.md | 4 ++-- fabric-ca/makeDocker.sh | 2 +- fabric-ca/start.sh | 2 +- scripts/bootstrap.sh | 6 +++--- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8fca23e..ed15aa61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node ('hyp-x') { // trigger build on x86_64 node env.ARCH = "amd64" env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim() env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile - env.BASE_IMAGE_VER = sh(returnStdout: true, script: 'cat Makefile | grep BASEIMAGE_RELEASE= | cut -d "=" -f2').trim() // BASEIMAGE Version from fabric Makefile + env.BASE_IMAGE_VER = sh(returnStdout: true, script: 'cat Makefile | grep "BASEIMAGE_RELEASE =" | cut -d "=" -f2').trim() // BASEIMAGE Version from fabric Makefile env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus env.PROJECT_VERSION = "${VERSION}-stable" env.BASE_IMAGE_TAG = "${ARCH}-${BASE_IMAGE_VER}" //fabric baseimage version diff --git a/README.md b/README.md index 6fe0be17..13617f75 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-rc1, 1.4.0-rc1 and 0.4.14 respectively. +are 1.4.0-rc2, 1.4.0-rc2 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 d6fc15a6..77a9f7e1 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-rc1" + "fabric-shim": "1.4.0-rc2" } } diff --git a/chaincode/chaincode_example02/node/package.json b/chaincode/chaincode_example02/node/package.json index 5f08fe85..9a4ab407 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": "1.4.0-rc1" + "fabric-shim": "1.4.0-rc2" } } diff --git a/chaincode/fabcar/javascript-low-level/package.json b/chaincode/fabcar/javascript-low-level/package.json index 9af96fa3..8a690e57 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-rc1" + "fabric-shim": "1.4.0-rc2" } } diff --git a/chaincode/fabcar/javascript/package.json b/chaincode/fabcar/javascript/package.json index 86164adf..618dd49f 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-rc1", - "fabric-shim": "1.4.0-rc1" + "fabric-contract-api": "1.4.0-rc2", + "fabric-shim": "1.4.0-rc2" }, "devDependencies": { "chai": "^4.1.2", diff --git a/chaincode/fabcar/typescript/package.json b/chaincode/fabcar/typescript/package.json index ef7b90c1..91663dd4 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-rc1", - "fabric-shim": "1.4.0-rc1" + "fabric-contract-api": "1.4.0-rc2", + "fabric-shim": "1.4.0-rc2" }, "devDependencies": { "@types/chai": "^4.1.7", diff --git a/chaincode/marbles02/node/package.json b/chaincode/marbles02/node/package.json index 8cc03eae..a4c202eb 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-rc1" + "fabric-shim": "1.4.0-rc2" } } diff --git a/commercial-paper/organization/digibank/contract/package.json b/commercial-paper/organization/digibank/contract/package.json index 0d838f75..816ea44a 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-rc1", - "fabric-shim": "1.4.0-rc1" + "fabric-contract-api": "1.4.0-rc2", + "fabric-shim": "1.4.0-rc2" }, "devDependencies": { "chai": "^4.1.2", diff --git a/commercial-paper/organization/magnetocorp/contract/package.json b/commercial-paper/organization/magnetocorp/contract/package.json index 0d838f75..816ea44a 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-rc1", - "fabric-shim": "1.4.0-rc1" + "fabric-contract-api": "1.4.0-rc2", + "fabric-shim": "1.4.0-rc2" }, "devDependencies": { "chai": "^4.1.2", diff --git a/fabric-ca/README.md b/fabric-ca/README.md index 458a7a5d..dab97422 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.4.0-rc1` - will run the sample with 1.4.0-rc1 version of Fabric and Fabric CA. + `FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.4.0-rc2` + will run the sample with 1.4.0-rc2 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 371b12e2..147fdc39 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.4.0-rc1} +export FABRIC_TAG=${FABRIC_TAG:-1.4.0-rc2} 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 083a5577..2a4789df 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.4.0-rc1 +# export FABRIC_TAG=1.4.0-rc2 # # To run with locally built images: # export FABRIC_TAG=local diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 19440692..cd7b184d 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-rc1 +export VERSION=1.4.0-rc2 # 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-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)" + 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)" } dockerFabricPull() {