From 209c36e02c67600d8bcc91bc42a2ab166c2b01d2 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sat, 25 Feb 2017 10:57:14 +0100
Subject: [PATCH] Move maven installation and configuration into separate
 script for travis

---
 .travis.yml                        | 18 +++++++-----------
 .travis/install-configure-maven.sh | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 .travis/install-configure-maven.sh

diff --git a/.travis.yml b/.travis.yml
index f55a512cbb..4c9006c12a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,25 +6,21 @@ addons:
 language: java
 jdk: oraclejdk8
 before_install:
-  - wget http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-  - tar zxvf apache-maven-3.3.9-bin.tar.gz
-  - chmod +x apache-maven-3.3.9/bin/mvn
-  - export M2_HOME=$PWD/apache-maven-3.3.9
-  - export PATH=$PWD/apache-maven-3.3.9/bin:${PATH}
-  - hash -r
+  - bash .travis/install-configure-maven.sh
+  - export M2_HOME=$HOME/apache-maven-3.3.9
+  - export PATH=$HOME/apache-maven-3.3.9/bin:${PATH}
   - openssl aes-256-cbc -K $encrypted_5630fbebf057_key -iv $encrypted_5630fbebf057_iv -in .travis/secrets.tar.enc -out .travis/secrets.tar -d
-  - cd .travis && tar xfv secrets.tar && cd ..
-  - echo "MAVEN_OPTS='-Xms1g -Xmx1g'" > "$HOME/.mavenrc"
-  - mkdir -p "$HOME/.m2"
-  - cp .travis/travis-toolchains.xml "$HOME/.m2/toolchains.xml"
-  - cp .travis/travis-settings.xml "$HOME/.m2/settings.xml"
+  - pushd .travis && tar xfv secrets.tar && popd
   - mkdir -p "$HOME/.ssh"
   - chmod 700 "$HOME/.ssh"
   - mv .travis/id_rsa "$HOME/.ssh/id_rsa"
   - chmod 600 "$HOME/.ssh/id_rsa"
   - mkdir -p "$HOME/.gpg"
   - gpg --batch --import .travis/release-signing-key-82DE7BE82166E84E.gpg
+  - rm .travis/secrets.tar
+  - rm .travis/release-signing-key-82DE7BE82166E84E.gpg
 install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+before_script: true
 script:
   - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash .travis/build-pull-request.sh; fi'
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ]; then bash .travis/build-push.sh; fi'
diff --git a/.travis/install-configure-maven.sh b/.travis/install-configure-maven.sh
new file mode 100644
index 0000000000..2b9028983c
--- /dev/null
+++ b/.travis/install-configure-maven.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -ev
+
+# remember the current directory
+SOURCE_HOME=$PWD
+
+cd $HOME
+wget http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+tar zxvf apache-maven-3.3.9-bin.tar.gz
+chmod +x apache-maven-3.3.9/bin/mvn
+
+echo "MAVEN_OPTS='-Xms1g -Xmx1g'" > .mavenrc
+mkdir -p .m2
+cp $SOURCE_HOME/.travis/travis-toolchains.xml .m2/toolchains.xml
+cp $SOURCE_HOME/.travis/travis-settings.xml .m2/settings.xml