From 6ded6135bfc39b3c1e4dc8a6462f33be6a585621 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:24:28 +0200 Subject: [PATCH 01/24] test code --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 2d355900c..72efbd592 100644 --- a/circle.yml +++ b/circle.yml @@ -11,6 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: + - mvn -B -X -e gitflow:release-start gitflow:release-finish - mvn test -T2C deployment: snapshot: @@ -25,6 +26,5 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy - git push origin $RELEASE_BRANCH - From 40def0b84b88fc4c7ca09442a3005c5753b5496c Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:39:19 +0200 Subject: [PATCH 02/24] test code --- circle.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 72efbd592..4739233b1 100644 --- a/circle.yml +++ b/circle.yml @@ -20,11 +20,9 @@ deployment: commands: - mvn deploy -DskipTests=true release: - tag: /.*/ commands: - git config user.name "circleci" - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy - - git push origin $RELEASE_BRANCH + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG From f0102dd9f3f449d4546727606f86c5c4f57789fb Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:39:30 +0200 Subject: [PATCH 03/24] test code --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 4739233b1..4c512a5dd 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,6 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn -B -X -e gitflow:release-start gitflow:release-finish - mvn test -T2C deployment: snapshot: From 6780117b0fec83f079452b047150d16cf8598033 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 17:49:14 +0200 Subject: [PATCH 04/24] deploy any branch --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 4c512a5dd..3ce63f489 100644 --- a/circle.yml +++ b/circle.yml @@ -19,6 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: + branch: /.*/ commands: - git config user.name "circleci" - git fetch From dfcf53fdd2befe004555655c49d0e447b1cb3c4b Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 18:11:34 +0200 Subject: [PATCH 05/24] comment code --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3ce63f489..950017893 100644 --- a/circle.yml +++ b/circle.yml @@ -24,5 +24,5 @@ deployment: - git config user.name "circleci" - git fetch - git checkout $RELEASE_BRANCH - - git tag -d $CIRCLE_TAG + # - git tag -d $CIRCLE_TAG - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG From 98727a7638b0309b1ddd490b48505cd5c9de87cb Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Fri, 22 Dec 2017 18:21:28 +0200 Subject: [PATCH 06/24] trigger build --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 950017893..3ce63f489 100644 --- a/circle.yml +++ b/circle.yml @@ -24,5 +24,5 @@ deployment: - git config user.name "circleci" - git fetch - git checkout $RELEASE_BRANCH - # - git tag -d $CIRCLE_TAG + - git tag -d $CIRCLE_TAG - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG From 3323bc1f9b6cde971e8022e01f46591a946bb2b0 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 12:30:19 +0200 Subject: [PATCH 07/24] skip tests --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3ce63f489..916a84b75 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2C + - mvn --version deployment: snapshot: branch: vgs-edition From 38890eebeae3b7af52bfac751c518fb5b3242ca3 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 12:30:43 +0200 Subject: [PATCH 08/24] skip tests --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 916a84b75..020b1baf1 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn --version + - mvn test -T2 -DskipTests deployment: snapshot: branch: vgs-edition From 3468a92f51afd0b023a93212c2632c447c0a1f61 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 12:42:46 +0200 Subject: [PATCH 09/24] try to fix dependencies --- pom.xml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 6a799c065..b681c1416 100644 --- a/pom.xml +++ b/pom.xml @@ -208,17 +208,6 @@ false - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - release - deploy - - @@ -775,6 +764,12 @@ + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + From 062857abce148ba4e44da1b39adc61eb1ff48bfb Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:10:24 +0200 Subject: [PATCH 10/24] full name of plugin --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 020b1baf1..46cb64281 100644 --- a/circle.yml +++ b/circle.yml @@ -25,4 +25,4 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG + - mvn -B -X -e com.amashchenko.maven.plugin:gitflow-maven-plugin:release-start com.amashchenko.maven.plugin:gitflow-maven-plugin:release-finish -DreleaseVersion=$CIRCLE_TAG From 3048c0ab60699c2aa566374f614ac5ccb6f7d56b Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:18:32 +0200 Subject: [PATCH 11/24] remove gitflow from report section --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index b681c1416..176584f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -764,12 +764,6 @@ - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - From 922de682b7701f27aaa7ed82a1720bfc970e4e14 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:23:42 +0200 Subject: [PATCH 12/24] removed gitfloe from dependency management --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 176584f2e..af9a666ba 100644 --- a/pom.xml +++ b/pom.xml @@ -503,12 +503,6 @@ maven-resources-plugin 3.0.2 - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - From 7d7944afa48ec8f26bd9cfa9d8a762e40d50c186 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:29:25 +0200 Subject: [PATCH 13/24] added gitflow from dependency management --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index af9a666ba..d4ddd00bc 100644 --- a/pom.xml +++ b/pom.xml @@ -503,6 +503,32 @@ maven-resources-plugin 3.0.2 + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + + From 29c26606a0e657a6ee8183d5db81e50d05aedcfa Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 14:49:52 +0200 Subject: [PATCH 14/24] added gitflow to release --- pom.xml | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index d4ddd00bc..7273e110f 100644 --- a/pom.xml +++ b/pom.xml @@ -208,6 +208,31 @@ false + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + + @@ -508,26 +533,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - - From fbb373e08d9ebfcb6f09c4c0678a265a09162c3b Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:09:37 +0200 Subject: [PATCH 15/24] added gitflow configs to command --- circle.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 46cb64281..f3b1c0c83 100644 --- a/circle.yml +++ b/circle.yml @@ -25,4 +25,10 @@ deployment: - git fetch - git checkout $RELEASE_BRANCH - git tag -d $CIRCLE_TAG - - mvn -B -X -e com.amashchenko.maven.plugin:gitflow-maven-plugin:release-start com.amashchenko.maven.plugin:gitflow-maven-plugin:release-finish -DreleaseVersion=$CIRCLE_TAG + - mvn -B -X -e com.amashchenko.maven.plugin:gitflow-maven-plugin:release-start com.amashchenko.maven.plugin:gitflow-maven-plugin:release-finish \ + -DreleaseVersion=$CIRCLE_TAG \ + -Dverbose=true -DversionDigitToIncrement=2 -DreleaseRebase=true -DpushRemote=false -DskipTestProject=true -DallowSnapshots=true \ + -DgitFlowConfig.productionBranch=versioning-test -DgitFlowConfig.developmentBranch=versioning-test \ + -DgitFlowConfig.releaseBranchPrefix=release- -DgitFlowConfig.versionTagPrefix='' \ + -DcommitMessages.releaseStartMessage='update versions for @{version} release' \ + -DcommitMessages.releaseFinishMessage='update for next development version @{version}' From f2c109111c48e946e673c5b9cfeb2dab3cd332a2 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:14:24 +0200 Subject: [PATCH 16/24] remove dependency --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 7273e110f..36fd3bef9 100644 --- a/pom.xml +++ b/pom.xml @@ -528,12 +528,6 @@ maven-resources-plugin 3.0.2 - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 - From 60c480153030a96a6cf0aeca18d3d178a00d42f1 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:16:00 +0200 Subject: [PATCH 17/24] remove no needed commands --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index f3b1c0c83..1da176806 100644 --- a/circle.yml +++ b/circle.yml @@ -23,8 +23,8 @@ deployment: commands: - git config user.name "circleci" - git fetch - - git checkout $RELEASE_BRANCH - - git tag -d $CIRCLE_TAG +# - git checkout $RELEASE_BRANCH +# - git tag -d $CIRCLE_TAG - mvn -B -X -e com.amashchenko.maven.plugin:gitflow-maven-plugin:release-start com.amashchenko.maven.plugin:gitflow-maven-plugin:release-finish \ -DreleaseVersion=$CIRCLE_TAG \ -Dverbose=true -DversionDigitToIncrement=2 -DreleaseRebase=true -DpushRemote=false -DskipTestProject=true -DallowSnapshots=true \ From 282d7f857f610bf256f0cafb86db5c1746415671 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 15:25:08 +0200 Subject: [PATCH 18/24] possible fix --- circle.yml | 18 +++++++----------- pom.xml | 34 +++++++++++++--------------------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/circle.yml b/circle.yml index 1da176806..2d355900c 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2 -DskipTests + - mvn test -T2C deployment: snapshot: branch: vgs-edition @@ -19,16 +19,12 @@ deployment: commands: - mvn deploy -DskipTests=true release: - branch: /.*/ + tag: /.*/ commands: - git config user.name "circleci" - git fetch -# - git checkout $RELEASE_BRANCH -# - git tag -d $CIRCLE_TAG - - mvn -B -X -e com.amashchenko.maven.plugin:gitflow-maven-plugin:release-start com.amashchenko.maven.plugin:gitflow-maven-plugin:release-finish \ - -DreleaseVersion=$CIRCLE_TAG \ - -Dverbose=true -DversionDigitToIncrement=2 -DreleaseRebase=true -DpushRemote=false -DskipTestProject=true -DallowSnapshots=true \ - -DgitFlowConfig.productionBranch=versioning-test -DgitFlowConfig.developmentBranch=versioning-test \ - -DgitFlowConfig.releaseBranchPrefix=release- -DgitFlowConfig.versionTagPrefix='' \ - -DcommitMessages.releaseStartMessage='update versions for @{version} release' \ - -DcommitMessages.releaseFinishMessage='update for next development version @{version}' + - git checkout $RELEASE_BRANCH + - git tag -d $CIRCLE_TAG + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy + - git push origin $RELEASE_BRANCH + diff --git a/pom.xml b/pom.xml index 36fd3bef9..6a799c065 100644 --- a/pom.xml +++ b/pom.xml @@ -209,28 +209,14 @@ - com.amashchenko.maven.plugin - gitflow-maven-plugin - 1.8.0 + org.apache.maven.plugins + maven-release-plugin + 2.5.3 - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - + true + false + release + deploy @@ -528,6 +514,12 @@ maven-resources-plugin 3.0.2 + + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + From 2cf95aa67a6cc57e5d4309226fea84a13098276d Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:17:15 +0200 Subject: [PATCH 19/24] Ignore some commands. Added configs in all gitflow declaration --- circle.yml | 10 +++++----- pom.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index 2d355900c..603cd75c8 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2C + - mvn test -T2C -DskipTests deployment: snapshot: branch: vgs-edition @@ -23,8 +23,8 @@ deployment: commands: - git config user.name "circleci" - git fetch - - git checkout $RELEASE_BRANCH - - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy - - git push origin $RELEASE_BRANCH +# - git checkout $RELEASE_BRANCH +# - git tag -d $CIRCLE_TAG + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG +# - git push origin $RELEASE_BRANCH diff --git a/pom.xml b/pom.xml index 6a799c065..cb9572818 100644 --- a/pom.xml +++ b/pom.xml @@ -219,6 +219,31 @@ deploy + + com.amashchenko.maven.plugin + gitflow-maven-plugin + 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + + @@ -514,11 +539,31 @@ maven-resources-plugin 3.0.2 - + com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + From 12ebc7edf3874d486344e73a87f4b8d7fc3a15da Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:21:58 +0200 Subject: [PATCH 20/24] release any branch --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 603cd75c8..a471bd6fc 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ deployment: commands: - mvn deploy -DskipTests=true release: - tag: /.*/ + branch: /.*/ commands: - git config user.name "circleci" - git fetch From 9978fc5c3b1d59a71446c587fe7c188e7f27212a Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:26:48 +0200 Subject: [PATCH 21/24] Test no needed configs --- pom.xml | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/pom.xml b/pom.xml index cb9572818..c9aaf24bf 100644 --- a/pom.xml +++ b/pom.xml @@ -544,26 +544,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - - @@ -608,26 +588,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - - From e304e85df6f116071d8df9aaf19f0db853e29961 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:33:29 +0200 Subject: [PATCH 22/24] Test no needed configs --- pom.xml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index c9aaf24bf..3b6aa299f 100644 --- a/pom.xml +++ b/pom.xml @@ -223,26 +223,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - - @@ -544,6 +524,26 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + From 475ecd166d13d7185550048d1fe95ad148969ec2 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:37:37 +0200 Subject: [PATCH 23/24] Test no needed configs --- pom.xml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 3b6aa299f..450d4b53a 100644 --- a/pom.xml +++ b/pom.xml @@ -524,26 +524,6 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 - - true - 2 - true - false - true - true - - - versioning-test - versioning-test - release- - - - - - update versions for @{version} release - update for next development version @{version} - - @@ -588,6 +568,26 @@ com.amashchenko.maven.plugin gitflow-maven-plugin 1.8.0 + + true + 2 + true + false + true + true + + + versioning-test + versioning-test + release- + + + + + update versions for @{version} release + update for next development version @{version} + + From 0a6ae14a23f67a232bda309c03989245482f3769 Mon Sep 17 00:00:00 2001 From: yuriyshafranyuk1 Date: Tue, 26 Dec 2017 17:50:06 +0200 Subject: [PATCH 24/24] revert changes for test --- circle.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/circle.yml b/circle.yml index a471bd6fc..2d355900c 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B test: override: - - mvn test -T2C -DskipTests + - mvn test -T2C deployment: snapshot: branch: vgs-edition @@ -19,12 +19,12 @@ deployment: commands: - mvn deploy -DskipTests=true release: - branch: /.*/ + tag: /.*/ commands: - git config user.name "circleci" - git fetch -# - git checkout $RELEASE_BRANCH -# - git tag -d $CIRCLE_TAG - - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -# - git push origin $RELEASE_BRANCH + - git checkout $RELEASE_BRANCH + - git tag -d $CIRCLE_TAG + - mvn -B -X -e gitflow:release-start gitflow:release-finish -DreleaseVersion=$CIRCLE_TAG -DpostReleaseGoals=deploy + - git push origin $RELEASE_BRANCH