diff --git a/Jenkinsfile b/Jenkinsfile index 1e32c4eb3682d2298056650e5890a5632e7f6d0d..971c052978ca3bc61b1425d5c02249fb7e504c98 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 f8a20e85e236e582c44bda29775bf6d1cea6f78b..c2d037a772de6439d7d1ce928daaa9e3bc56a47c 100644 --- a/kafka-ui-api/pom.xml +++ b/kafka-ui-api/pom.xml @@ -5,7 +5,7 @@ kafka-ui com.provectus - 0.0.2-SNAPSHOT + 0.0.1-SNAPSHOT 4.0.0 diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml index 1969c2550e62055375dec8974a9226e7983e6606..927a9681bdd0632084bf5bcfa996ba35e1ca262c 100644 --- a/kafka-ui-contract/pom.xml +++ b/kafka-ui-contract/pom.xml @@ -5,7 +5,7 @@ kafka-ui com.provectus - 0.0.2-SNAPSHOT + 0.0.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index ea0fa880ffc4a542aeef058c06259e126e24abb0..67f8d113cd84496be415790321d442ff99110aed 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ com.provectus kafka-ui - 0.0.2-SNAPSHOT + 0.0.1-SNAPSHOT kafka-ui Kafka metrics for UI panel