Prepare 2.1.1 release (#133)

Signed-off-by: James Taylor <jamest@uk.ibm.com>
hyperledger · Apr 22, 2020 · aab1364 · aab1364
1 parent 3e67b8c
commit aab1364
Show file tree

Hide file tree

Showing 21 changed files with 67 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v2.1.1
+Wed 22 Apr 2020 10:31:05 BST
+
+* [3e67b8c](https://github.com/hyperledger/fabric-chaincode-node/commit/3e67b8c) [FABCN-394](https://jira.hyperledger.org/browse/FABCN-394) Update typescript interface file (#128)
+* [61c253a](https://github.com/hyperledger/fabric-chaincode-node/commit/61c253a) [FABCN-391](https://jira.hyperledger.org/browse/FABCN-391) fix directory for api doc publish (#125)
+* [c753261](https://github.com/hyperledger/fabric-chaincode-node/commit/c753261) [FABCN-391](https://jira.hyperledger.org/browse/FABCN-391) Bump to 2.1.1 and fix docker tag (#122)
+
 ## v2.1.0
 Wed  1 Apr 2020 16:12:36 BST
 

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

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.1-unstable",
-  "tag": "unstable",
+  "version": "2.1.1",
+  "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.1-unstable",
+    "fabric-shim-api": "2.1.1",
     "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.1-unstable",
-  "tag": "unstable",
+  "version": "2.1.1",
+  "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 2.1.1-unstable
+npm install 2.1.1
 // 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.1-unstable"
+		"fabric-shim": "2.1.1"
 	}
 }
 ```

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

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.1-unstable",
-    "tag": "unstable",
+    "version": "2.1.1",
+    "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.1-unstable",
-  "tag": "unstable",
+  "version": "2.1.1",
+  "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": {
@@ -61,8 +61,8 @@
     "@grpc/proto-loader": "^0.5.1",
     "@types/node": "^8.9.4",
     "ajv": "^6.5.5",
-    "fabric-contract-api": "2.1.1-unstable",
-    "fabric-shim-api": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1",
+    "fabric-shim-api": "2.1.1",
     "fs-extra": "8.1.0",
     "grpc": "^1.23.3",
     "reflect-metadata": "^0.1.12",

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

diff --git a/release_notes/v2.1.1.txt b/release_notes/v2.1.1.txt
@@ -0,0 +1,16 @@
+v2.1.1
+------
+
+Release Notes
+-------------
+There are minimal changes between v2.1.0 and v2.1.1, please see the change log for a full list of updates.
+
+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
+
+- FABCN-394 fabric-shim incorrectly implements interface ChaincodeStub from fabric-shim-api
+
+Change Log
+----------
+https://github.com/hyperledger/fabric-chaincode-node/blob/release-2.x/CHANGELOG.md#v2.1.1
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.1-unstable",
-    "fabric-contract-api": "2.1.1-unstable",
+    "fabric-shim": "2.1.1",
+    "fabric-contract-api": "2.1.1",
     "@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.1-unstable",
-      "fabric-contract-api": "2.1.1-unstable"
+      "fabric-shim": "2.1.1",
+      "fabric-contract-api": "2.1.1"
     }
 }
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.1-unstable",
-      "fabric-contract-api": "2.1.1-unstable"
+      "fabric-shim": "2.1.1",
+      "fabric-contract-api": "2.1.1"
     }
 }
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.1-unstable",
-      "fabric-contract-api": "2.1.1-unstable"
+      "fabric-shim": "2.1.1",
+      "fabric-contract-api": "2.1.1"
     }
 }
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.1-unstable",
-    "fabric-contract-api": "2.1.1-unstable"
+    "fabric-shim": "2.1.1",
+    "fabric-contract-api": "2.1.1"
   }
 }
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.1-unstable",
-      "fabric-contract-api": "2.1.1-unstable",
-      "fabric-shim-crypto": "2.1.1-unstable"
+      "fabric-shim": "2.1.1",
+      "fabric-contract-api": "2.1.1",
+      "fabric-shim-crypto": "2.1.1"
     }
 }
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.1-unstable",
-    "fabric-contract-api": "2.1.1-unstable"
+    "fabric-shim": "2.1.1",
+    "fabric-contract-api": "2.1.1"
   }
 }
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.1-unstable",
-    "fabric-contract-api": "2.1.1-unstable"
+    "fabric-shim": "2.1.1",
+    "fabric-contract-api": "2.1.1"
   }
 }
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.1-unstable",
-    "fabric-contract-api": "2.1.1-unstable"
+    "fabric-shim": "2.1.1",
+    "fabric-contract-api": "2.1.1"
   }
 }
diff --git a/test/fv/package.json b/test/fv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fvtests",
-  "version": "2.1.1-unstable",
+  "version": "2.1.1",
   "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.1-unstable",
-    "fabric-shim": "2.1.1-unstable",
-    "fabric-shim-api": "2.1.1-unstable",
-    "fabric-shim-crypto": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1",
+    "fabric-shim": "2.1.1",
+    "fabric-shim-api": "2.1.1",
+    "fabric-shim-crypto": "2.1.1",
     "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.1-unstable
+      - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.1
       # Allow more time for chaincode container to build on install.
       - CORE_CHAINCODE_EXECUTETIMEOUT=300s
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric