Merge pull request #45 from conveyal/dev

Next release

README.md

@@ -4,7 +4,7 @@ Automated release management for maven projects
 
 ## About
 
-maven-semantic-release is a plugin for [semantic-release](https://github.com/semantic-release/semantic-release) v15.  This project will deploy a maven project to maven central instead of deploying a node.js project to npm.  This tool is intended to be used on github projects that use a Travis-CI server.
+maven-semantic-release is a plugin for [semantic-release](https://github.com/semantic-release/semantic-release) v16+.  This project will deploy a maven project to maven central instead of deploying a node.js project to npm.  This tool is intended to be used on github projects that use a Travis-CI server.
 
 The workflow this assumes is that your project will use [Angular-style commit messages](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#type) (theoretically you could override this and use a different style) and only merge to master when you want to create a new release.  When a new release is generated, it will automatically be deployed to maven central.
 
@@ -126,7 +126,7 @@ Also, you'll want to install maven-semantic-release and semantic-release in a st
 
 ```
 before_script:
-  - yarn global add @conveyal/maven-semantic-release semantic-release@15
+  - yarn global add @conveyal/maven-semantic-release semantic-release
 ```
 
 ### Step 6:  Add a github token to Travis
@@ -138,5 +138,3 @@ Create a Github token that will be used to make commits and create releases.  Ad
 ## Which `mvn` will be used
 
 This plugin uses the `mvn` command in your `PATH`. If you have [maven-wrapper script](https://github.com/takari/maven-wrapper) at the project root directory, this plugin will use that instead.
-
-

lib/git.js

@@ -36,7 +36,7 @@ async function push (origin, branch, execaOpts) {
 }
 
 async function configureGit (context) {
-  const {env, cwd, logger, options} = context
+  const {branch, cwd, env, logger} = context
   const execaOpts = {env, cwd}
 
   // fetch all branches because Travis doesn't do it for us
@@ -57,9 +57,9 @@ async function configureGit (context) {
   logger.log('fetching branches')
   await execa('git', ['fetch'], execaOpts)
 
-  // checkout master and pull latest
+  // checkout the release branch and pull latest
   logger.log('checking out release branch')
-  await execa('git', ['checkout', options.branch], execaOpts)
+  await execa('git', ['checkout', branch.name], execaOpts)
 
   logger.log('pulling')
   await execa('git', ['pull'], execaOpts)
@@ -70,9 +70,9 @@ async function configureGit (context) {
  * in the options for this to work.
  */
 async function mergeMasterIntoDev (context) {
-  const {env, cwd, logger, options} = context
+  const {branch, cwd, env, logger, options} = context
   const execaOpts = {env, cwd}
-  const {branch, devBranch, repositoryUrl} = options
+  const {devBranch, repositoryUrl} = options
 
   logger.log('Merging master branch into dev branch')
 
@@ -82,7 +82,7 @@ async function mergeMasterIntoDev (context) {
 
   // merge
   logger.log('merging release branch into dev branch')
-  await execa('git', ['merge', branch], execaOpts)
+  await execa('git', ['merge', branch.name], execaOpts)
 
   // push
   logger.log('pushing dev branch')
@@ -95,8 +95,8 @@ async function mergeMasterIntoDev (context) {
  * Commit, add and push changes to the pom.xml file(s)
  */
 async function saveChangesToPomXml (context, versionStr) {
-  const {env, cwd, logger, options} = context
-  const {branch, repositoryUrl} = options
+  const {branch, cwd, env, logger, options} = context
+  const {repositoryUrl} = options
   const execaOpts = {env, cwd}
 
   const isSnapshotVersion = versionStr.indexOf('SNAPSHOT') > -1
@@ -133,7 +133,7 @@ async function saveChangesToPomXml (context, versionStr) {
   process.stdout.write('\n')
 
   logger.log('pushing changes')
-  await push(repositoryUrl, branch, execaOpts)
+  await push(repositoryUrl, branch.name, execaOpts)
 
   logger.log('changes pushed')
 }

package.json

@@ -25,9 +25,9 @@
   },
   "devDependencies": {
     "mastarm": "^5.1.3",
-    "semantic-release": "^15.12.3"
+    "semantic-release": "^17.3.0"
   },
   "peerDependencies": {
-    "semantic-release": "^15.12.3"
+    "semantic-release": "^17.3.0"
   }
 }