From 29d8152eb9b922a4bdd244c9e5addb266bab104c Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Mon, 9 Nov 2020 20:36:38 +0100 Subject: [PATCH] TSK-1463: travis now using maven-wrapper --- .travis.yml | 10 +++++----- ci/change_version.sh | 6 ++++-- ci/compile.sh | 16 ++++++++-------- ci/test.sh | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index a56a096bd..a0effde69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,13 +107,13 @@ jobs: install: ci/change_version.sh -m . && ( cd web && npm install ) && ( cd web && npm run build:prod-silent ) - && mvn -q install -B -T 2C -pl :taskana-rest-spring-example-boot,:taskana-cdi -am -DskipTests -Dcheckstyle.skip -Dasciidoctor.skip - && mvn -q prepare-package -B -T 2C -pl :taskana-rest-spring - && mvn -q install -B -T 2C -f history -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip - && mvn -q install -B -T 2C -pl :taskana-rest-spring-example-boot -P history.plugin -DskipTests -Dcheckstyle.skip + && ./mvnw -q install -B -T 2C -pl :taskana-rest-spring-example-boot,:taskana-cdi -am -DskipTests -Dcheckstyle.skip -Dasciidoctor.skip + && ./mvnw -q prepare-package -B -T 2C -pl :taskana-rest-spring + && ./mvnw -q install -B -T 2C -f history -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip + && ./mvnw -q install -B -T 2C -pl :taskana-rest-spring-example-boot -P history.plugin -DskipTests -Dcheckstyle.skip before_script: ci/verify_docs_jar.sh script: | - mvn deploy -B -T 2C -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \ + ./mvnw deploy -B -T 2C -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \ --settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip \ -pl :taskana-parent,\ :taskana-common-parent,:taskana-common,:taskana-common-data,:taskana-common-test,\ diff --git a/ci/change_version.sh b/ci/change_version.sh index 1fb07c7e7..0054d146b 100755 --- a/ci/change_version.sh +++ b/ci/change_version.sh @@ -45,13 +45,15 @@ function increment_version() { # Arguments: # $1: directory of pom # $2: new version +# Environment variable: +# REL: relative path to this file function change_version() { - mvn -q versions:set -f "$1" -DnewVersion="$2" -DartifactId=* -DgroupId=* versions:commit + $REL/../mvnw -q versions:set -f "$1" -DnewVersion="$2" -DartifactId=* -DgroupId=* versions:commit } function main() { [[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0 - + REL=$(dirname "$0") while [[ $# -gt 0 ]]; do case $1 in -i) diff --git a/ci/compile.sh b/ci/compile.sh index c1b09353d..a3e31c963 100755 --- a/ci/compile.sh +++ b/ci/compile.sh @@ -34,23 +34,23 @@ function main() { ;; COMMON) set -x - mvn -q install -B -T 2C -f $REL/.. -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -N - mvn -q test-compile -B -T 2C -f $REL/../common + $REL/../mvnw -q install -B -T 2C -f $REL/.. -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -N + $REL/../mvnw -q test-compile -B -T 2C -f $REL/../common ;; LIB) set -x - mvn -q install -B -T 2C -f $REL/.. -pl :taskana-core -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip - mvn -q test-compile -B -T 2C -f $REL/../lib + $REL/../mvnw -q install -B -T 2C -f $REL/.. -pl :taskana-core -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip + $REL/../mvnw -q test-compile -B -T 2C -f $REL/../lib ;; REST) set -x - mvn -q install -B -T 2C -f $REL/.. -pl :taskana-simplehistory-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Dasciidoctor.skip - mvn -q test-compile -B -T 2C -f $REL/../rest + $REL/../mvnw -q install -B -T 2C -f $REL/.. -pl :taskana-simplehistory-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Dasciidoctor.skip + $REL/../mvnw -q test-compile -B -T 2C -f $REL/../rest ;; HISTORY) set -x - mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Dasciidoctor.skip - mvn -q test-compile -B -T 2C -f $REL/../history + $REL/../mvnw -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Dasciidoctor.skip + $REL/../mvnw -q test-compile -B -T 2C -f $REL/../history ;; esac } diff --git a/ci/test.sh b/ci/test.sh index 75de39a67..4782ff183 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -35,50 +35,50 @@ function main() { set -x eval "$REL/prepare_db.sh '$1'" # We can not use the fancy '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049 - (cd $REL/.. && mvn -q install -B -T 2C -Pcoverage -Dcheckstyle.skip) + (cd $REL/.. && ./mvnw -q install -B -T 2C -Pcoverage -Dcheckstyle.skip) eval "$REL/verify_docs_jar.sh" # disabling sonarqube for PRs because it's not supported yet. See https://jira.sonarsource.com/browse/MMF-1371 if [ -n "$2" ]; then # -Pcoverage to activate jacoco and test coverage reports # send test coverage and build information to sonarcloud - mvn -q sonar:sonar -B -T 2C -f $REL/.. -Pcoverage -Dsonar.projectKey="$2" + $REL/../mvnw -q sonar:sonar -B -T 2C -f $REL/.. -Pcoverage -Dsonar.projectKey="$2" fi ;; DB2_11_1) set -x eval "$REL/prepare_db.sh '$1'" - mvn -q verify -B -T 2C -f $REL/.. -pl :taskana-core -am -Dmaven.javadoc.skip -Dcheckstyle.skip + $REL/../mvnw -q verify -B -T 2C -f $REL/.. -pl :taskana-core -am -Dmaven.javadoc.skip -Dcheckstyle.skip ;; POSTGRES_10) set -x eval "$REL/prepare_db.sh '$1'" ### INSTALL ### - mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring-example-common -am -P postgres -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip + $REL/../mvnw -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring-example-common -am -P postgres -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip ### TEST ### - mvn -q verify -B -T 2C -f $REL/.. -pl :taskana-core -Dmaven.javadoc.skip -Dcheckstyle.skip + $REL/../mvnw -q verify -B -T 2C -f $REL/.. -pl :taskana-core -Dmaven.javadoc.skip -Dcheckstyle.skip ;; WILDFLY) set -x eval "$REL/prepare_db.sh 'POSTGRES_10'" # Same as above (H2) we can not use the fancy '-f' maven option - (cd $REL/../rest/taskana-rest-spring-example-wildfly && mvn -q verify -B -T 2C -Ddb.type=postgres) + (cd $REL/../rest/taskana-rest-spring-example-wildfly && ../../mvnw -q verify -B -T 2C -Ddb.type=postgres) ;; HISTORY) set -x ### INSTALL ### - mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip + $REL/../mvnw -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip ### TEST ### - mvn -q verify -B -T 2C -f $REL/../history -Dmaven.javadoc.skip -Dcheckstyle.skip + $REL/../mvnw -q verify -B -T 2C -f $REL/../history -Dmaven.javadoc.skip -Dcheckstyle.skip ;; WEB) set -x ### INSTALL ### (cd $REL/../web && npm install --silent && npm run build:prod-silent) - mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring-example-boot -am -P history.plugin -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip - mvn spring-boot:run -P history.plugin -f $REL/../rest/taskana-rest-spring-example-boot > /dev/null & + $REL/../mvnw -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring-example-boot -am -P history.plugin -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip + $REL/../mvnw spring-boot:run -P history.plugin -f $REL/../rest/taskana-rest-spring-example-boot > /dev/null & ### TEST ### (cd $REL/../web && npm run test -- --coverageReporters text-summary)