Merge branch 'master' of github.com:atlassian/cz-lerna-changelog

.travis.yml

@@ -6,13 +6,11 @@ cache:
 notifications:
   email: false
 node_js:
-  - '4'
-before_install:
-  - npm i -g npm@^2.0.0
+  - stable
 before_script:
   - npm prune
 after_success:
   - npm run semantic-release
 branches:
-  only:
-    - master
+  except:
+    - /^v\d+\.\d+\.\d+$/

README.md

@@ -1,8 +1,8 @@
-# cz-conventional-changelog
+# cz-lerna-changelog
 
 Status:
-[![npm version](https://img.shields.io/npm/v/cz-conventional-changelog.svg?style=flat-square)](https://www.npmjs.org/package/cz-conventional-changelog)
-[![npm downloads](https://img.shields.io/npm/dm/cz-conventional-changelog.svg?style=flat-square)](http://npm-stat.com/charts.html?package=cz-conventional-changelog&from=2015-08-01)
-[![Build Status](https://img.shields.io/travis/commitizen/cz-conventional-changelog.svg?style=flat-square)](https://travis-ci.org/commitizen/cz-conventional-changelog)
+[![npm version](https://img.shields.io/npm/v/cz-lerna-changelog.svg?style=flat-square)](https://www.npmjs.org/package/cz-lerna-changelog)
+[![npm downloads](https://img.shields.io/npm/dm/cz-lerna-changelog.svg?style=flat-square)](http://npm-stat.com/charts.html?package=cz-lerna-changelog&from=2015-08-01)
+[![Build Status](https://img.shields.io/travis/atlassian/cz-lerna-changelog.svg?style=flat-square)](https://travis-ci.org/atlassian/cz-lerna-changelog)
 
-Part of the [commitizen](https://github.com/commitizen/cz-cli) family. Prompts for [conventional changelog](https://github.com/stevemao/conventional-changelog-angular/blob/master/index.js) standard.
+Part of the [commitizen](https://github.com/commitizen/cz-cli) family. Prompts for [conventional changelog](https://github.com/stevemao/conventional-changelog-angular/blob/master/index.js) standard in a [lerna](https://lernajs.io/) environment.

package.json

@@ -1,6 +1,5 @@
 {
   "name": "cz-lerna-changelog",
-  "version": "0.1.0",
   "description": "Commitizen adapter following the conventional-changelog format.",
   "main": "lib/index.js",
   "scripts": {
@@ -12,18 +11,22 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jpnelson/cz-lerna-changelog.git"
+    "url": "https://github.com/atlassian/cz-lerna-changelog.git"
   },
-  "author": "Joshua Nelson <[email protected]>",
+  "author": "Joshua Nelson <[email protected]>, Joscha Feth <[email protected]>",
+  "license": "MIT",
   "dependencies": {
     "cz-conventional-changelog": "jpnelson/cz-conventional-changelog#fe629d0f",
-    "lerna": "jpnelson/lerna#config-concurrency-committed-lib-with-exec",
     "shelljs": "0.7.0"
   },
+  "peerDependencies": {
+    "lerna": "*"
+  },
   "devDependencies": {
     "babel-cli": "6.8.0",
     "babel-preset-es2015": "6.6.0",
     "commitizen": "1.0.5",
+    "lerna": "jpnelson/lerna#8c0e5a44",
     "semantic-release": "^4.3.5"
   },
   "directories": {