Merge pull request #12 from sstone1/master

Simon Stone · web-flow · commit d62cece821a8 · 2017-01-30T13:42:42.000-08:00
Bump version to 0.4.0
diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.3.12"
+  "version": "0.4.0"
 }
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "name": "fabric-composer",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "main": "index.js",
   "private": true,
   "scripts": {
diff --git a/packages/composer-admin/package.json b/packages/composer-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-admin",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "Fabric Composer admin, code that manages business networks",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -43,8 +43,8 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-connector-hlf": "^0.3.12"
+    "composer-common": "^0.4.0",
+    "composer-connector-hlf": "^0.4.0"
   },
   "license-check-config": {
     "src": [
diff --git a/packages/composer-cli/package.json b/packages/composer-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-cli",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "Fabric Composer command line interfaces (CLIs)",
   "bin": {
     "composer": "cli.js"
@@ -37,9 +37,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-admin": "^0.3.12",
-    "composer-client": "^0.3.12",
-    "composer-common": "^0.3.12",
+    "composer-admin": "^0.4.0",
+    "composer-client": "^0.4.0",
+    "composer-common": "^0.4.0",
     "homedir": "^0.6.0",
     "moment": "^2.17.1",
     "npm-paths": "^0.1.3",
diff --git a/packages/composer-client/package.json b/packages/composer-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-client",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The node.js client library for Fabric Composer, the Hyperledger Fabric development framework",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -39,8 +39,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-connector-hlf": "^0.3.12",
+    "composer-common": "^0.4.0",
+    "composer-connector-hlf": "^0.4.0",
     "uuid": "^3.0.0"
   },
   "devDependencies": {
diff --git a/packages/composer-common/package.json b/packages/composer-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-common",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "Fabric Composer Common, code that is common across client, admin and runtime.",
   "main": "index.js",
   "typings": "index.d.ts",
diff --git a/packages/composer-connector-embedded/package.json b/packages/composer-connector-embedded/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-embedded",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The embedded client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -49,8 +49,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-runtime": "^0.3.12",
-    "composer-runtime-embedded": "^0.3.12"
+    "composer-common": "^0.4.0",
+    "composer-runtime": "^0.4.0",
+    "composer-runtime-embedded": "^0.4.0"
   }
 }
diff --git a/packages/composer-connector-hlf/package.json b/packages/composer-connector-hlf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-hlf",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The Hyperledger Fabric Client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -37,8 +37,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-runtime-hlf": "^0.3.12",
+    "composer-common": "^0.4.0",
+    "composer-runtime-hlf": "^0.4.0",
     "fs-extra": "^1.0.0",
     "hfc": "^0.6.5",
     "semver": "^5.3.0",
diff --git a/packages/composer-connector-proxy/package.json b/packages/composer-connector-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-proxy",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The proxying client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -50,7 +50,7 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
+    "composer-common": "^0.4.0",
     "socket.io-client": "^1.7.2"
   }
 }
diff --git a/packages/composer-connector-server/package.json b/packages/composer-connector-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-server",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The remote connector server for Fabric Composer",
   "bin": {
     "concerto-connector-server": "cli.js"
@@ -41,9 +41,9 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-connector-embedded": "^0.3.12",
-    "composer-connector-hlf": "^0.3.12",
+    "composer-common": "^0.4.0",
+    "composer-connector-embedded": "^0.4.0",
+    "composer-connector-hlf": "^0.4.0",
     "serializerr": "^1.0.3",
     "socket.io": "^1.7.2",
     "uuid": "^3.0.1",
diff --git a/packages/composer-connector-web/package.json b/packages/composer-connector-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-web",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The web client connector for Fabric Composer",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -59,8 +59,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-runtime": "^0.3.12",
-    "composer-runtime-web": "^0.3.12"
+    "composer-common": "^0.4.0",
+    "composer-runtime": "^0.4.0",
+    "composer-runtime-web": "^0.4.0"
   }
 }
diff --git a/packages/composer-loopback-connector/package.json b/packages/composer-loopback-connector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-loopback-connector",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "A Loopback connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -25,11 +25,11 @@
   "author": "Fabric Composer",
   "license": "Apache-2",
   "dependencies": {
-    "composer-admin": "^0.3.12",
-    "composer-client": "^0.3.12",
-    "composer-common": "^0.3.12",
-    "composer-connector-embedded": "^0.3.12",
-    "composer-connector-web": "^0.3.12",
+    "composer-admin": "^0.4.0",
+    "composer-client": "^0.4.0",
+    "composer-common": "^0.4.0",
+    "composer-connector-embedded": "^0.4.0",
+    "composer-connector-web": "^0.4.0",
     "loopback-connector": "^2.5.0"
   },
   "devDependencies": {
diff --git a/packages/composer-runtime-embedded/package.json b/packages/composer-runtime-embedded/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-embedded",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The embedded runtime container for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -50,7 +50,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-runtime": "^0.3.12",
+    "composer-runtime": "^0.4.0",
     "dexie": "^1.5.1",
     "fake-indexeddb": "^1.0.8",
     "uuid": "^3.0.1"
diff --git a/packages/composer-runtime-hlf/package.json b/packages/composer-runtime-hlf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-hlf",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The Hyperledger Fabric runtime container for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "license": "Apache-2.0",
   "dependencies": {},
   "devDependencies": {
-    "composer-runtime": "^0.3.12",
+    "composer-runtime": "^0.4.0",
     "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babelify": "^7.3.0",
diff --git a/packages/composer-runtime-web/package.json b/packages/composer-runtime-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-web",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The web runtime container for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -59,7 +59,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-runtime": "^0.3.12",
+    "composer-runtime": "^0.4.0",
     "dexie": "^1.5.1",
     "uuid": "^3.0.1"
   }
diff --git a/packages/composer-runtime/package.json b/packages/composer-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "The runtime execution environment for Fabric Composer",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -62,7 +62,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
+    "composer-common": "^0.4.0",
     "debug": "^2.4.4",
     "fast-json-patch": "^1.1.2",
     "jsonata": "^1.0.10",
diff --git a/packages/composer-systests/package.json b/packages/composer-systests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-systests",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "private": true,
   "description": "System tests and automation for Fabric Composer",
   "main": "index.js",
@@ -31,11 +31,11 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "chai-subset": "^1.3.0",
-    "composer-admin": "^0.3.12",
-    "composer-client": "^0.3.12",
-    "composer-common": "^0.3.12",
-    "composer-connector-embedded": "^0.3.12",
-    "composer-connector-web": "^0.3.12",
+    "composer-admin": "^0.4.0",
+    "composer-client": "^0.4.0",
+    "composer-common": "^0.4.0",
+    "composer-connector-embedded": "^0.4.0",
+    "composer-connector-web": "^0.4.0",
     "eslint": "^3.10.2",
     "homedir": "^0.6.0",
     "karma": "^1.3.0",
diff --git a/packages/composer-ui/config/webpack.common.js b/packages/composer-ui/config/webpack.common.js
@@ -24,7 +24,7 @@ const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin');
  */
 const HMR = helpers.hasProcessFlag('hot');
 const METADATA = {
-  title: 'Blockchain Composer',
+  title: 'Fabric Composer',
   baseUrl: '/',
   isDevServer: helpers.isWebpackDevServer()
 };
diff --git a/packages/composer-ui/package.json b/packages/composer-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "composer-ui",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "A test harness/UI for the web runtime container for Fabric Composer",
   "bin": {
     "composer": "cli.js"
@@ -66,8 +66,8 @@
     "webpack": "webpack"
   },
   "dependencies": {
-    "composer-common": "^0.3.12",
-    "composer-connector-server": "^0.3.12",
+    "composer-common": "^0.4.0",
+    "composer-connector-server": "^0.4.0",
     "express": "^4.14.0",
     "opener": "^1.4.2",
     "socket.io": "^1.7.2"
@@ -107,12 +107,12 @@
     "browserfs": "^1.1.0",
     "codelyzer": "^2.0.0-beta.4",
     "codemirror": "^5.22.0",
-    "composer-admin": "^0.3.12",
-    "composer-client": "^0.3.12",
-    "composer-connector-proxy": "^0.3.12",
-    "composer-connector-web": "^0.3.12",
-    "composer-runtime": "^0.3.12",
-    "composer-runtime-web": "^0.3.12",
+    "composer-admin": "^0.4.0",
+    "composer-client": "^0.4.0",
+    "composer-connector-proxy": "^0.4.0",
+    "composer-connector-web": "^0.4.0",
+    "composer-runtime": "^0.4.0",
+    "composer-runtime-web": "^0.4.0",
     "copy-webpack-plugin": "^4.0.1",
     "core-js": "^2.4.1",
     "css-loader": "^0.26.1",
diff --git a/packages/composer-ui/src/app/app.component.html b/packages/composer-ui/src/app/app.component.html
@@ -1,6 +1,6 @@
 <header>
   <nav class="navbar navbar-fixed-top navbar-dark bg-primary">
-    <a class="navbar-brand" href="#">Blockchain Composer</a>
+    <a class="navbar-brand" href="#">Fabric Composer</a>
     <ul class="nav navbar-nav">
       <li class="nav-item" [routerLinkActive]="['active']">
         <a class="nav-link" [routerLink]="['./editor']" placement="bottom" tooltip="Edit the business network definitions" container="body">Editor</a>
diff --git a/packages/generator-composer/package.json b/packages/generator-composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-fabric-composer",
-  "version": "0.3.12",
+  "version": "0.4.0",
   "description": "Generates skeleton projects from Fabric Composer business network definitions",
   "files": [
     "generators/app"
@@ -9,7 +9,7 @@
     "yeoman-generator"
   ],
   "dependencies": {
-    "composer-client": "^0.3.12",
+    "composer-client": "^0.4.0",
     "bower": "^1.8.0",
     "fs": "0.0.1-security",
     "shelljs": "^0.7.5",

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`"packages": [`
`4`	`4`	`"packages/*"`
`5`	`5`	`],`
`6`		`- "version": "0.3.12"`
	`6`	`+ "version": "0.4.0"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "composer-common",`
`3`		`- "version": "0.3.12",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "Fabric Composer Common, code that is common across client, admin and runtime.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"typings": "index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "composer-connector-embedded",`
`3`		`- "version": "0.3.12",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "The embedded client connector for Fabric Composer",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
`@@ -49,8 +49,8 @@`
`49`	`49`	`"watchify": "^3.7.0"`
`50`	`50`	`},`
`51`	`51`	`"dependencies": {`
`52`		`- "composer-common": "^0.3.12",`
`53`		`- "composer-runtime": "^0.3.12",`
`54`		`- "composer-runtime-embedded": "^0.3.12"`
	`52`	`+ "composer-common": "^0.4.0",`
	`53`	`+ "composer-runtime": "^0.4.0",`
	`54`	`+ "composer-runtime-embedded": "^0.4.0"`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "composer-connector-proxy",`
`3`		`- "version": "0.3.12",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "The proxying client connector for Fabric Composer",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
`@@ -50,7 +50,7 @@`
`50`	`50`	`"watchify": "^3.7.0"`
`51`	`51`	`},`
`52`	`52`	`"dependencies": {`
`53`		`- "composer-common": "^0.3.12",`
	`53`	`+ "composer-common": "^0.4.0",`
`54`	`54`	`"socket.io-client": "^1.7.2"`
`55`	`55`	`}`
`56`	`56`	`}`