From d974db1e10bfb6be57ac4feef961cd0d9f3a1b84 Mon Sep 17 00:00:00 2001
From: yuriyshafranyuk1 <shkafy@gmail.com>
Date: Fri, 15 Dec 2017 15:14:02 +0200
Subject: [PATCH 1/2] Added jgitflow plugin

---
 pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pom.xml b/pom.xml
index 1b2526b6c..63131b38f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,6 +538,25 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>external.atlassian.jgitflow</groupId>
+                <artifactId>jgitflow-maven-plugin</artifactId>
+                <version>1.0-m5.1</version>
+                <configuration>
+                    <enableSshAgent>true</enableSshAgent>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <allowUntracked>true</allowUntracked>
+                    <noDeploy>true</noDeploy>
+
+                    <flowInitContext>
+                        <developBranchName>versioning-test</developBranchName>
+                        <masterBranchName>versioning-test</masterBranchName>
+                        <versionTagPrefix/>
+                        <releaseBranchPrefix>release-</releaseBranchPrefix>
+                    </flowInitContext>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

From d2f5d6517fa327ad15026d29cfe969d8e2eb8a01 Mon Sep 17 00:00:00 2001
From: yuriyshafranyuk1 <shkafy@gmail.com>
Date: Fri, 15 Dec 2017 16:05:52 +0200
Subject: [PATCH 2/2] Added custom version and remove ssh agent

---
 circle.yml | 4 ++--
 pom.xml    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index eb2dcc51c..d778da5b5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -20,6 +20,6 @@ deployment:
   release:
       tag: /.*/
       commands:
-        - mvn jgitflow:release-start 
-        - mvn jgitflow:release-finish
+        - mvn jgitflow:release-start -X -e -DreleaseVersion=$CIRCLE_TAG
+        - mvn jgitflow:release-finish -X -e
         - git push versioning-test
diff --git a/pom.xml b/pom.xml
index 63131b38f..770f8a936 100644
--- a/pom.xml
+++ b/pom.xml
@@ -524,7 +524,6 @@
                 <artifactId>jgitflow-maven-plugin</artifactId>
                 <version>1.0-m5.1</version>
                 <configuration>
-                    <enableSshAgent>true</enableSshAgent>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <allowUntracked>true</allowUntracked>
                     <noDeploy>true</noDeploy>