From 4a73f1d4f1e255630fe721a38e7fdfa3bdfc64bd Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Mon, 20 Feb 2017 18:46:22 +0100
Subject: [PATCH] Move travis specific files into own subdirectory .travis

---
 .travis.yml                                   |  9 +++--
 .travis-deploy.sh => .travis/travis-deploy.sh |  0
 .../travis-settings.xml                       |  0
 .travis/travis-toolchains.xml                 | 34 +++++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)
 rename .travis-deploy.sh => .travis/travis-deploy.sh (100%)
 rename .travis-settings.xml => .travis/travis-settings.xml (100%)
 create mode 100644 .travis/travis-toolchains.xml

diff --git a/.travis.yml b/.travis.yml
index b0701567d6..cfe7025c72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
 language: java
+jdk: oraclejdk8
+before_install:
+  - echo "MAVEN_OPTS='-Xms1g -Xmx1g'" > "$HOME/.mavenrc"
+  - mkdir -p "$HOME/.m2"
+  - cp .travis/travis-toolchains.xml "$HOME/.m2/toolchains.xml"
 before_script:
   - SHOULD_DEPLOY=no
   - '[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && SHOULD_DEPLOY=yes || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Deploy" )'
   - export SHOULD_DEPLOY
 script:
-  - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn deploy --settings .travis-settings.xml || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Deploy" )'
+  - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn deploy --settings .travis/travis-settings.xml || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Deploy" )'
   - '[ "${SHOULD_DEPLOY}" = "yes" ] || mvn verify'
   - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=${SONAR_TOKEN} || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Sonar" )'
 
@@ -14,7 +19,7 @@ deploy:
     tags: true
     condition: "${TRAVIS_SECURE_ENV_VARS} = true"
   - provider: script
-    script: bash .travis-deploy.sh
+    script: bash .travis/travis-deploy.sh
   - provider: releases
     api_key: ${GITHUB_OAUTH_TOKEN}
     file:
diff --git a/.travis-deploy.sh b/.travis/travis-deploy.sh
similarity index 100%
rename from .travis-deploy.sh
rename to .travis/travis-deploy.sh
diff --git a/.travis-settings.xml b/.travis/travis-settings.xml
similarity index 100%
rename from .travis-settings.xml
rename to .travis/travis-settings.xml
diff --git a/.travis/travis-toolchains.xml b/.travis/travis-toolchains.xml
new file mode 100644
index 0000000000..caba9380c7
--- /dev/null
+++ b/.travis/travis-toolchains.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains>
+  <!-- place this file in ${user.home}/.m2/toolchains.xml -->
+
+  <!-- see: https://github.com/travis-ci/travis-cookbooks/blob/master/cookbooks/travis_java/templates/ubuntu/jdk_switcher.sh.erb -->
+
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.6</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-6-openjdk-amd64</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.7</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-7-openjdk-amd64</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.8</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-8-oracle</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>
\ No newline at end of file