From 6de49bb872aa500f309ae652d5d5f64cbb6528d2 Mon Sep 17 00:00:00 2001
From: Emanuel Zienecker <emanuel.zienecker@device-insight.com>
Date: Mon, 29 Apr 2019 08:40:31 +0200
Subject: [PATCH 1/2] Various improvements to the release process

---
 README.adoc |  4 +---
 pom.xml     | 16 +++++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.adoc b/README.adoc
index 9f789ea..92aa8e6 100644
--- a/README.adoc
+++ b/README.adoc
@@ -88,9 +88,7 @@ Now if you call the actuator endpoint `actuator/health` you should see the follo
 
 Creating a new release involves the following steps:
 
-. `./mvnw -DenableSshAgent=true jgitflow:release-start jgitflow:release-finish` +
-[NOTE]
-The `-DenableSshAgent=true` is only necessary, if you cloned the repository via SSH.
+. `./mvnw gitflow:release-start gitflow:release-finish`
 . `git push origin master`
 . `git push --tags`
 . `git push origin develop`
diff --git a/pom.xml b/pom.xml
index fd37034..5321079 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 		<!-- Versions -->
 		<junit.jupiter.version>5.3.2</junit.jupiter.version>
 		<docker-maven-plugin.version>0.27.2</docker-maven-plugin.version>
-		<jgitflow-maven-plugin.version>1.0-m5.1</jgitflow-maven-plugin.version>
+		<gitflow-maven-plugin.version>1.12.0</gitflow-maven-plugin.version>
 		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
 		<spring.kafka.version>2.2.4.RELEASE</spring.kafka.version>
 
@@ -114,13 +114,15 @@
 					<version>${maven-surefire-plugin.version}</version>
 				</plugin>
 				<plugin>
-					<groupId>external.atlassian.jgitflow</groupId>
-					<artifactId>jgitflow-maven-plugin</artifactId>
-					<version>${jgitflow-maven-plugin.version}</version>
+					<groupId>com.amashchenko.maven.plugin</groupId>
+					<artifactId>gitflow-maven-plugin</artifactId>
+					<version>${gitflow-maven-plugin.version}</version>
 					<configuration>
-						<autoVersionSubmodules>true</autoVersionSubmodules>
-						<noDeploy>true</noDeploy>
-						<useReleaseProfile>false</useReleaseProfile>
+						<pushRemote>false</pushRemote>
+						<gitFlowConfig>
+							<developmentBranch>develop</developmentBranch>
+						</gitFlowConfig>
+						<versionDigitToIncrement>1</versionDigitToIncrement>
 					</configuration>
 				</plugin>
 			</plugins>

From a089a684b00bfb2a6d0c83de12a9e4ed5dbb66d0 Mon Sep 17 00:00:00 2001
From: Emanuel Zienecker <emanuel.zienecker@device-insight.com>
Date: Mon, 29 Apr 2019 08:43:17 +0200
Subject: [PATCH 2/2] Update versions for release

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5321079..d971357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.deviceinsight.kafka</groupId>
 	<artifactId>kafka-health-check</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>Kafka Health Check</name>