From c0a5775a390a01a02095a0a0bfcd091c51e9d1e2 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 19 Dec 2017 12:39:52 +0100 Subject: [PATCH] TSK-26: deploy script now updating WARarchive dependency temporary until someone fixes the issue --- .travis.yml | 2 +- lib/deployment/deploy.sh | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff37b4a30..6a95eeff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: script: - mvn verify -f lib/ && mvn verify -f rest/ - && lib/deployment/deploy.sh -p lib/ -m "lib/taskana-core/ lib/taskana-spring/ lib/taskana-cdi/" -mf manifest.yml -avc rest/ + && lib/deployment/deploy.sh -p lib/ -m "lib/taskana-core/ lib/taskana-spring/ lib/taskana-cdi/" -mf manifest.yml -avc rest/ -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java deploy: provider: cloudfoundry username: tobias.schaefer@novatec-gmbh.de diff --git a/lib/deployment/deploy.sh b/lib/deployment/deploy.sh index 51d31d705..16d3dbfec 100755 --- a/lib/deployment/deploy.sh +++ b/lib/deployment/deploy.sh @@ -196,7 +196,12 @@ function main { shift # past argument shift # past value ;; - *) # unknown option + -swarm) + local SWARM="$2" + shift # past argument + shift # past value + ;; + *) # unknown option echo "unknown parameter $1" >&2 exit 1 ;; @@ -282,23 +287,29 @@ function main { exit 1 fi + local newVersion=`increment_version ${TRAVIS_TAG##v}` + if [[ -n "$PARENT_DIR" ]]; then - change_version "$PARENT_DIR" "`increment_version ${TRAVIS_TAG##v}`-SNAPSHOT" + change_version "$PARENT_DIR" "$newVersion-SNAPSHOT" else for dir in ${MODULES[@]}; do - change_version "$dir" "`increment_version ${TRAVIS_TAG##v}`-SNAPSHOT" + change_version "$dir" "$newVersion-SNAPSHOT" done fi for dir in ${ADDITIONAL_VC[@]}; do - change_version "$dir" "`increment_version ${TRAVIS_TAG##v}`-SNAPSHOT" + change_version "$dir" "$newVersion-SNAPSHOT" done + if [[ -n "$SWARM" ]]; then + $debug sed -i "s/pro.taskana:taskana-core.*-SNAPSHOT/pro.taskana:taskana-core:$newVersion-SNAPSHOT/" "$SWARM" + fi + if [[ -n "$MANIFEST" ]]; then $debug sed -i "s|$MANIFEST_PREFIX.*\.jar|$MANIFEST_PREFIX-${TRAVIS_TAG##v}-SNAPSHOT.jar|" "$MANIFEST" fi - push_new_poms "$MANIFEST" + push_new_poms "$MANIFEST" "$SWARM" fi }