From 1767a7286ce9c547daa24b5689a75f4ff1b99974 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 12 Dec 2017 14:11:48 +0100 Subject: [PATCH] TSK-26: now inrementing last number when writing back to github --- lib/deployment/deploy.sh | 18 ++++++++++++++++-- lib/pom.xml | 2 +- lib/taskana-cdi-example/pom.xml | 6 +++--- lib/taskana-cdi/pom.xml | 4 ++-- lib/taskana-core/pom.xml | 2 +- lib/taskana-spring-example/pom.xml | 6 +++--- lib/taskana-spring/pom.xml | 4 ++-- 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/lib/deployment/deploy.sh b/lib/deployment/deploy.sh index 1e60efab2..c05d0cd51 100755 --- a/lib/deployment/deploy.sh +++ b/lib/deployment/deploy.sh @@ -57,6 +57,20 @@ function deploy { $debug mvn deploy -f "$1" -P "$2" --settings "$3" -DskipTests=true -B -U } +# takes a version (without leading v) and increments its +# last number by one. +# Arguments: +# $1: version (without leading v) which will be patched +# Return: +# version with last number incremented +function patch_version() { + if [[ ! "$1" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then + echo "'$1' does not match tag pattern." >&2 + exit 1; + fi + echo "${1%\.*}.`expr ${1##*\.*\.} + 1`" +} + # changing version in pom and all its children # Arguments: # $1: directory of pom @@ -75,7 +89,7 @@ function push_new_poms() { #to compensate new updates $debug git pull $debug git add "./*pom.xml" - $debug git commit -m "Updated poms to version ${TRAVIS_TAG##v}-SNAPSHOT" + $debug git commit -m "Updated poms to version `patch_version ${TRAVIS_TAG##v}`-SNAPSHOT" #push poms (authentication via GH_TOKEN) $debug git remote add deployment "https://$GH_TOKEN@github.com/$reqRepo.git" @@ -167,7 +181,7 @@ function main { done if [[ -n "$branch" && -n "$parent_dir" ]]; then - change_version "$parent_dir" "${TRAVIS_TAG##v}-SNAPSHOT" + change_version "$parent_dir" "`patch_version ${TRAVIS_TAG##v}`-SNAPSHOT" if [[ -z "$GH_TOKEN" ]]; then echo 'GH_TOKEN not set' >&2 exit 1 diff --git a/lib/pom.xml b/lib/pom.xml index 0b76ce706..dcf00d79b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-parent - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT pom diff --git a/lib/taskana-cdi-example/pom.xml b/lib/taskana-cdi-example/pom.xml index e84778aba..7c00bd362 100644 --- a/lib/taskana-cdi-example/pom.xml +++ b/lib/taskana-cdi-example/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-cdi-example - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT war @@ -23,13 +23,13 @@ pro.taskana taskana-core - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT pro.taskana taskana-cdi - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT \ No newline at end of file diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml index 1a5ba3898..7bb5517b3 100644 --- a/lib/taskana-cdi/pom.xml +++ b/lib/taskana-cdi/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-cdi - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT ${project.groupId}:${project.artifactId} TODO @@ -153,7 +153,7 @@ pro.taskana taskana-core - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT provided diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml index 738817c2a..523edf3ec 100644 --- a/lib/taskana-core/pom.xml +++ b/lib/taskana-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-core - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT ${project.groupId}:${project.artifactId} TODO diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml index 5e7f98bca..12fb71fae 100644 --- a/lib/taskana-spring-example/pom.xml +++ b/lib/taskana-spring-example/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-spring-example - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT org.springframework.boot spring-boot-starter-parent @@ -42,12 +42,12 @@ pro.taskana taskana-core - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT pro.taskana taskana-spring - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml index ea36c4ba1..a48a27bef 100644 --- a/lib/taskana-spring/pom.xml +++ b/lib/taskana-spring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pro.taskana taskana-spring - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT ${project.groupId}:${project.artifactId} TODO @@ -158,7 +158,7 @@ pro.taskana taskana-core - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT