FAB-6052 Change versions to 1.1.0-snapshot

Change-Id: I2b042921223b0329ecefdfa2e252412a721f14e6
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.0.2
+Tue Sep  5 15:14:46 EDT 2017
+
+* [1667327](https://github.com/hyperledger/fabric-sdk-node/commit/1667327) [FAB-5879](https://jira.hyperledger.org/browse/FAB-5879) Add support for node 8 in addition to 6
+* [bdd97f3](https://github.com/hyperledger/fabric-sdk-node/commit/bdd97f3) Clean deadcode in FileKeyValueStore.js
+* [79d5bc9](https://github.com/hyperledger/fabric-sdk-node/commit/79d5bc9) [FAB-5896](https://jira.hyperledger.org/browse/FAB-5896) Security implications documentation
+* [a4be9ba](https://github.com/hyperledger/fabric-sdk-node/commit/a4be9ba) [FAB-5885](https://jira.hyperledger.org/browse/FAB-5885) per-request timeout
+* [66a8eef](https://github.com/hyperledger/fabric-sdk-node/commit/66a8eef) [[FAB-5597](https://jira.hyperledger.org/browse/FAB-5597)] typos in doc and log messages
+* [9e003be](https://github.com/hyperledger/fabric-sdk-node/commit/9e003be) [[FAB-5775](https://jira.hyperledger.org/browse/FAB-5775)] Update grpc module >= 1.3.5
+
 ## v1.0.1
 Wed Aug  9 15:58:10 EDT 2017
 

build/tasks/test.js

@@ -25,6 +25,27 @@ console.log('\n####################################################');
 console.log(util.format('# debug log: %s', debugPath));
 console.log('####################################################\n');
 
+let arch = process.arch;
+let dockerImageTag = '';
+let release = require(path.join(__dirname, '../../fabric-client/package.json')).version;
+if (!/-snapshot/.test(release)) {
+	// this is a release build, need to build the proper docker image tag
+	// to run the tests against the corresponding fabric released docker images
+	if (arch.indexOf('x64') === 0)
+		dockerImageTag = ':x86_64';
+	else if (arch.indexOf('s390') === 0)
+		dockerImageTag = ':s390x';
+	else if (arch.indexOf('ppc64') === 0)
+		dockerImageTag = ':ppc64le';
+	else
+		throw new Error('Unknown architecture: ' + arch);
+
+	dockerImageTag += '-' + release;
+}
+
+process.env.DOCKER_IMG_TAG = dockerImageTag;
+
+
 gulp.task('pre-test', function() {
 	return gulp.src([
 		'node_modules/fabric-client/lib/**/*.js',

fabric-ca-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabric-ca-client",
-  "version": "1.0.2-snapshot",
+  "version": "1.1.0-snapshot",
   "main": "index.js",
   "repository": {
     "type": "gerrit",

fabric-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabric-client",
-  "version": "1.0.2-snapshot",
+  "version": "1.1.0-snapshot",
   "main": "index.js",
   "repository": {
     "type": "gerrit",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabric-sdk-node",
-  "version": "1.0.2-snapshot",
+  "version": "1.1.0-snapshot",
   "main": "index.js",
   "repository": {
     "type": "gerrit",

release_notes/v1.0.2.txt

@@ -0,0 +1,24 @@
+v1.0.2 September 5, 2017
+-------------------------
+
+Release Notes
+-------------
+# gRPC dependency has been upgraded
+# Added node.js 8.4 engine support
+# Bug fixes and documentation
+
+Known Vulnerabilities
+---------------------
+none
+
+Resolved Vulnerabilities
+------------------------
+none
+
+Known Issues & Workarounds
+--------------------------
+none
+
+Change Log
+----------
+https://github.com/hyperledger/fabric-sdk-node/blob/master/CHANGELOG.md#v102

scripts/changelog.sh

@@ -6,7 +6,7 @@
 #
 echo "## $2\n$(date)" >> CHANGELOG.new
 echo "" >> CHANGELOG.new
-git log $1..HEAD  --oneline | grep -v Merge | sed -e "s/\[\(FAB-[0-9]*\)\]/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric-sdk-node\/commit\/\1)/" >> CHANGELOG.new
+git log $1..HEAD  --oneline | grep -v Merge | sed -e "s/\(FAB-[0-9]*\)/\[\1\](https:\/\/jira.hyperledger.org\/browse\/\1\)/" -e "s/\([0-9|a-z]*\)/* \[\1\](https:\/\/github.com\/hyperledger\/fabric-sdk-node\/commit\/\1)/" >> CHANGELOG.new
 echo "" >> CHANGELOG.new
 cat CHANGELOG.md >> CHANGELOG.new
 mv -f CHANGELOG.new CHANGELOG.md

test/fixtures/docker-compose.yaml

@@ -7,7 +7,7 @@ version: '2'
 
 services:
   ca0:
-    image: hyperledger/fabric-ca
+    image: hyperledger/fabric-ca${DOCKER_IMG_TAG}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_CA_NAME=ca-org1
@@ -24,7 +24,7 @@ services:
     container_name: ca_peerOrg1
 
   ca1:
-    image: hyperledger/fabric-ca
+    image: hyperledger/fabric-ca${DOCKER_IMG_TAG}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_CA_NAME=ca-org2
@@ -42,7 +42,7 @@ services:
 
   orderer.example.com:
     container_name: orderer.example.com
-    image: hyperledger/fabric-orderer
+    image: hyperledger/fabric-orderer${DOCKER_IMG_TAG}
     environment:
       - ORDERER_GENERAL_LOGLEVEL=debug
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -66,7 +66,7 @@ services:
 
   peer0.org1.example.com:
     container_name: peer0.org1.example.com
-    image: hyperledger/fabric-peer
+    image: hyperledger/fabric-peer${DOCKER_IMG_TAG}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer0.org1.example.com
@@ -97,7 +97,7 @@ services:
 
   peer0.org2.example.com:
     container_name: peer0.org2.example.com
-    image: hyperledger/fabric-peer
+    image: hyperledger/fabric-peer${DOCKER_IMG_TAG}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer0.org2.example.com
@@ -125,7 +125,7 @@ services:
 
   couchdb:
     container_name: couchdb
-    image: hyperledger/fabric-couchdb
+    image: hyperledger/fabric-couchdb${DOCKER_IMG_TAG}
     ports:
       - 5984:5984
     environment: