Prepare 2.1.4 release

Signed-off-by: James Taylor <jamest@uk.ibm.com>
hyperledger · Jun 22, 2020 · 4f8eaa0 · 4f8eaa0
1 parent 81e1123
commit 4f8eaa0
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v2.1.4
+Mon 22 Jun 2020 14:51:02 BST
+
+* [81e1123](https://github.com/hyperledger/fabric-chaincode-node/commit/81e1123) Specify exact version of winston dependency
+
 ## v2.1.3
 Fri 19 Jun 15:26:50 BST 2020
 

diff --git a/TUTORIAL.md b/TUTORIAL.md
@@ -28,8 +28,8 @@ The dependencies of `fabric-contract-api` and `fabric-shim` will be required.
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-contract-api": "^2.1.0",
-    "fabric-shim": "^2.1.0"
+    "fabric-contract-api": "^2.1.4",
+    "fabric-shim": "^2.1.4"
   }
 }
 

diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-contract-api",
-  "version": "2.1.3",
-  "tag": "unstable",
+  "version": "2.1.4",
+  "tag": "latest",
   "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
   "repository": {
@@ -46,7 +46,7 @@
     "lines": 100
   },
   "dependencies": {
-    "fabric-shim-api": "2.1.3",
+    "fabric-shim-api": "2.1.4",
     "class-transformer": "^0.2.2",
     "fast-safe-stringify": "~2.0.7",
     "get-params": "^0.1.2",

diff --git a/apis/fabric-shim-api/package.json b/apis/fabric-shim-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-shim-api",
-  "version": "2.1.3",
-  "tag": "unstable",
+  "version": "2.1.4",
+  "tag": "latest",
   "description": "A node.js API of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
   "repository": {

diff --git a/docs/_jsdoc/tutorials/using-chaincodeinterface.md b/docs/_jsdoc/tutorials/using-chaincodeinterface.md
@@ -8,7 +8,7 @@ cd mycc
 // create a new node project
 npm init
 // install fabric-shim at master branch
-npm install fabric-shim@2.1.3-unstable
+npm install fabric-shim@2.1.4
 // or using the released version
 npm install fabric-shim
 touch mychaincode.js
@@ -68,7 +68,7 @@ Finally, update the "start" script in package.json to "node mychaincode.js":
 	"engineStrict": true,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"fabric-shim": "2.1.3"
+		"fabric-shim": "2.1.4"
 	}
 }
 ```

diff --git a/docs/_jsdoc/tutorials/using-contractinterface.md b/docs/_jsdoc/tutorials/using-contractinterface.md
@@ -28,8 +28,8 @@ The dependencies of `fabric-contract-api` and `fabric-shim` will be required.
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-contract-api": "^2.1.0",
-    "fabric-shim": "^2.1.0"
+    "fabric-contract-api": "^2.1.4",
+    "fabric-shim": "^2.1.4"
   }
 }
 

diff --git a/libraries/fabric-shim-crypto/package.json b/libraries/fabric-shim-crypto/package.json
@@ -1,7 +1,7 @@
 {
     "name": "fabric-shim-crypto",
-    "version": "2.1.3",
-    "tag": "unstable",
+    "version": "2.1.4",
+    "tag": "latest",
     "description": "A node.js implementation of encryption library for Hyperledger Fabric chaincode shim",
     "main": "index.js",
     "repository": {

diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-shim",
-  "version": "2.1.3",
-  "tag": "unstable",
+  "version": "2.1.4",
+  "tag": "latest",
   "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
   "bin": {
@@ -59,8 +59,8 @@
     "@grpc/proto-loader": "^0.5.4",
     "@types/node": "^8.9.4",
     "ajv": "^6.5.5",
-    "fabric-contract-api": "2.1.3",
-    "fabric-shim-api": "2.1.3",
+    "fabric-contract-api": "2.1.4",
+    "fabric-shim-api": "2.1.4",
     "fs-extra": "8.1.0",
     "reflect-metadata": "^0.1.12",
     "winston": "3.2.1",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-chaincode-node",
-  "version": "2.1.3",
-  "tag": "unstable",
+  "version": "2.1.4",
+  "tag": "latest",
   "description": "fabric-chaincode-node monorepo, built with rush",
   "testFabricVersion": "master",
   "testFabricCAVersion": "1.4.4",

diff --git a/release_notes/v2.1.4.txt b/release_notes/v2.1.4.txt
@@ -0,0 +1,20 @@
+v2.1.4
+------
+
+Release Notes
+-------------
+
+- FABCN-418 Dependency unable to use git
+
+  Locks the version of the winston library to 3.2.1
+  The updated winston library after 3.3.0 prevents chaincode installing due to
+  a new requirement for git which is not available in the
+  hyperledger/fabric-nodeenv docker image.
+
+The release-2.0 branch has been renamed to release-2.x; the v2.1.0 release supercedes v2.0.0.
+The release-1.4 branch is currently LTS, please see the proposed Fabric LTS strategy for more information:
+https://github.com/hyperledger/fabric-rfcs/pull/23
+
+Change Log
+----------
+https://github.com/hyperledger/fabric-chaincode-node/blob/release-2.x/CHANGELOG.md#v2.1.4
diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json
@@ -18,8 +18,8 @@
   "author": "",
   "license": "APACHE-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.3",
-    "fabric-contract-api": "2.1.3",
+    "fabric-shim": "2.1.4",
+    "fabric-contract-api": "2.1.4",
     "@types/node": "^10.3.6",
     "ts-node": "^3.3.0",
     "tslint": "^5.6.0",

diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json
@@ -15,7 +15,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.3",
-      "fabric-contract-api": "2.1.3"
+      "fabric-shim": "2.1.4",
+      "fabric-contract-api": "2.1.4"
     }
 }
diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json
@@ -15,7 +15,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.3",
-      "fabric-contract-api": "2.1.3"
+      "fabric-shim": "2.1.4",
+      "fabric-contract-api": "2.1.4"
     }
 }
diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json
@@ -15,7 +15,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.3",
-      "fabric-contract-api": "2.1.3"
+      "fabric-shim": "2.1.4",
+      "fabric-contract-api": "2.1.4"
     }
 }
diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.3",
-    "fabric-contract-api": "2.1.3"
+    "fabric-shim": "2.1.4",
+    "fabric-contract-api": "2.1.4"
   }
 }
diff --git a/test/chaincodes/encryption/package.json b/test/chaincodes/encryption/package.json
@@ -15,8 +15,8 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.3",
-      "fabric-contract-api": "2.1.3",
-      "fabric-shim-crypto": "2.1.3"
+      "fabric-shim": "2.1.4",
+      "fabric-contract-api": "2.1.4",
+      "fabric-shim-crypto": "2.1.4"
     }
 }
diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.3",
-    "fabric-contract-api": "2.1.3"
+    "fabric-shim": "2.1.4",
+    "fabric-contract-api": "2.1.4"
   }
 }
diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.3",
-    "fabric-contract-api": "2.1.3"
+    "fabric-shim": "2.1.4",
+    "fabric-contract-api": "2.1.4"
   }
 }
diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.3",
-    "fabric-contract-api": "2.1.3"
+    "fabric-shim": "2.1.4",
+    "fabric-contract-api": "2.1.4"
   }
 }
diff --git a/test/fv/package.json b/test/fv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fvtests",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "fv tests",
   "testFabricVersion": "master",
   "testFabricThirdParty": "0.4.15",
@@ -26,10 +26,10 @@
     "del": "^3.0.0",
     "delay": "4.3.0",
     "eslint": "6.6.0",
-    "fabric-contract-api": "2.1.3",
-    "fabric-shim": "2.1.3",
-    "fabric-shim-api": "2.1.3",
-    "fabric-shim-crypto": "2.1.3",
+    "fabric-contract-api": "2.1.4",
+    "fabric-shim": "2.1.4",
+    "fabric-shim-api": "2.1.4",
+    "fabric-shim-crypto": "2.1.4",
     "fs-extra": "8.1.0",
     "git-rev-sync": "1.12.0",
     "gulp": "^4.0.0",

diff --git a/tools/toolchain/network/docker-compose/docker-compose-base.yaml b/tools/toolchain/network/docker-compose/docker-compose-base.yaml
@@ -92,7 +92,7 @@ services:
       # # bridge network as the peers
       # # https://docs.docker.com/compose/networking/
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default
-      - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.3
+      - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.4
       # Allow more time for chaincode container to build on install.
       - CORE_CHAINCODE_EXECUTETIMEOUT=300s
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric