[flink] branch master updated: [hotfix][travis] Retain existing MAVEN_OPTS in Travis maven setup

[chesnay]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 446e711  [hotfix][travis] Retain existing MAVEN_OPTS in Travis maven 
setup
446e711 is described below

commit 446e7117e706ac654b2fc8d0202b9d0a02eae6f8
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Fri Apr 26 13:19:56 2019 +0200

    [hotfix][travis] Retain existing MAVEN_OPTS in Travis maven setup
    
    Removes a potential sources of unexpected behavior for when we defined 
MAVEN_OPTS in .travis.yml, which until now would've been ignored by this script.
---
 tools/travis/setup_maven.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/travis/setup_maven.sh b/tools/travis/setup_maven.sh
index 1de4bd9..5714762 100755
--- a/tools/travis/setup_maven.sh
+++ b/tools/travis/setup_maven.sh
@@ -29,7 +29,7 @@ fi
 
 export M2_HOME="${MAVEN_VERSIONED_DIR}"
 export PATH=${M2_HOME}/bin:${PATH}
-export MAVEN_OPTS="-Dorg.slf4j.simpleLogger.showDateTime=true 
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS"
+export MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.showDateTime=true 
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS"
 
 # just in case: clean up the .m2 home and remove invalid jar files
 if [ -d "${HOME}/.m2/repository/" ]; then