Enhancement of Travis CI test script

Author: mabrarov

.travis.yml

@@ -16,7 +16,6 @@ env:
     - BOOST_SHA256: '8211e639fd443cbffed7891af9c54012848d04df340ee993bedb3ef0346347c3'
     - DOCKERHUB_USER: 'abrarov'
     - MAVEN_WRAPPER: '0'
-    - DOCKER_PUSH_RETRIES: '10'
 
 matrix:
   include:
@@ -28,7 +27,7 @@ matrix:
       jdk: 'openjdk8'
       env:
         - MAVEN_WRAPPER: '1'
-    # OpenJDK 11 with Maven Wrapper
+    # OpenJDK 11
     - dist: 'bionic'
       jdk: 'openjdk11'
 

travis/build-and-test.sh

@@ -50,13 +50,20 @@ build_maven_project() {
 }
 
 test_images() {
-  maven_project_version="$(mvn \
-    --file "${TRAVIS_BUILD_DIR}/pom.xml" \
-    --batch-mode \
-    --non-recursive \
-    --define expression=project.version \
-    org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
-    | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')"
+  if [[ "${MAVEN_WRAPPER}" -ne 0 ]]; then
+    project_version_cmd="${project_version_cmd:+${project_version_cmd} }$(printf "%q" "${TRAVIS_BUILD_DIR}/mvnw")"
+  else
+    project_version_cmd="${project_version_cmd:+${project_version_cmd} }mvn"
+  fi
+  maven_settings_file="${TRAVIS_BUILD_DIR}/travis/settings.xml"
+  if [[ -f "${maven_settings_file}" ]]; then
+    project_version_cmd="${project_version_cmd:+${project_version_cmd} }--settings $(printf "%q" "${maven_settings_file}")"
+  fi
+  project_version_cmd="${project_version_cmd:+${project_version_cmd} }--file $(printf "%q" "${TRAVIS_BUILD_DIR}/pom.xml")"
+  project_version_cmd="${project_version_cmd:+${project_version_cmd} }--batch-mode --non-recursive"
+  project_version_cmd="${project_version_cmd:+${project_version_cmd} }--define expression=project.version"
+  project_version_cmd="${project_version_cmd:+${project_version_cmd} }org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate"
+  maven_project_version="$(eval "${project_version_cmd}" | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')"
 
   image_name="${DOCKERHUB_USER}/maven-docker-builder-app:${maven_project_version}"
   echo "Running container created from ${image_name} image"