Commit 2bcf55b4 authored by Jonathan Doklovic's avatar Jonathan Doklovic

Merge branch 'hotfix/1.0-m1.1'

parents 06a1710a 0fb4dba2
......@@ -4,7 +4,7 @@
<parent>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-parent</artifactId>
<version>1.0-m1</version>
<version>1.0-m1.1</version>
</parent>
<artifactId>jgit-flow-core</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-parent</artifactId>
<version>1.0-m1</version>
<version>1.0-m1.1</version>
</parent>
<artifactId>jgitflow-maven-plugin</artifactId>
......
......@@ -9,7 +9,7 @@
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-parent</artifactId>
<version>1.0-m1</version>
<version>1.0-m1.1</version>
<packaging>pom</packaging>
......@@ -331,7 +331,7 @@
<!--<mavenVersion>3.0.5</mavenVersion>-->
<maven.plugin.plugin.version>3.1</maven.plugin.plugin.version>
<maven.release.version>2.4</maven.release.version>
<jsch.agent.version>0.0.5</jsch.agent.version>
<jsch.agent.version>0.0.7</jsch.agent.version>
<jgit.version>3.3.1.201403241930-r</jgit.version>
<jline.version>1.0</jline.version>
<gson.version>2.2.2</gson.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment