From ed08f278f95dca46e58e24a13923939d268eedd3 Mon Sep 17 00:00:00 2001
From: Bulat Yusupov <usbulat@gmail.com>
Date: Fri, 31 Jul 2020 15:37:01 +0300
Subject: [PATCH] moved tagging before creating release notes (#88)

Co-authored-by: Bulat Yusupov <byusupov@provectus.com>
---
 Jenkinsfile               | 4 ++--
 kafka-ui-api/pom.xml      | 2 +-
 kafka-ui-contract/pom.xml | 2 +-
 pom.xml                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1e32c4eb36..971c052978 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -76,7 +76,7 @@ spec:
                 }
             }
         }
-        stage('Tag release branch') {
+        stage('Get version from pom.xml') {
             when {
                 expression { return env.GIT_BRANCH == 'origin/master'; }
             }
@@ -84,7 +84,6 @@ spec:
                 script {
                     pom = readMavenPom file: 'pom.xml'
                     VERSION = pom.version
-                    sh "git tag -f v$VERSION"
                 }
             }
         }
@@ -136,6 +135,7 @@ spec:
                 script {
                     withCredentials([usernamePassword(credentialsId: 'github-jenkins-internal-provectus', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USER')]) {
                         sh "bash -x release_json.sh v$VERSION"
+                        sh "git tag -f v$VERSION"
                         sh "git push -f --tags https://$GIT_USER:$GIT_PASSWORD@github.com/provectus/kafka-ui.git"
                         sh "curl -XPOST -u $GIT_USER:$GIT_PASSWORD --data @/tmp/release.json https://api.github.com/repos/provectus/kafka-ui/releases"
                     }
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index f8a20e85e2..c2d037a772 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kafka-ui</artifactId>
         <groupId>com.provectus</groupId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 1969c2550e..927a9681bd 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kafka-ui</artifactId>
         <groupId>com.provectus</groupId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index ea0fa880ff..67f8d113cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
 	<groupId>com.provectus</groupId>
 	<artifactId>kafka-ui</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<name>kafka-ui</name>
 	<description>Kafka metrics for UI panel</description>
 </project>