From 435d30775ccb67edb9a16b8f99ee7176457f2350 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sat, 2 Jul 2016 12:50:56 +0200
Subject: [PATCH] Add a toolchains.xml for travis

---
 .travis-toolchains.xml | 34 ++++++++++++++++++++++++++++++++++
 .travis.yml            | 18 ++++++++----------
 pom.xml                | 25 -------------------------
 3 files changed, 42 insertions(+), 35 deletions(-)
 create mode 100644 .travis-toolchains.xml

diff --git a/.travis-toolchains.xml b/.travis-toolchains.xml
new file mode 100644
index 0000000000..7ef8f5a325
--- /dev/null
+++ b/.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</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <version>1.7</version>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-7-openjdk</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
diff --git a/.travis.yml b/.travis.yml
index 05530f7b5e..5b09385a06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,17 @@
 language: java
+jdk: oraclejdk8
 before_install:
-  - echo "MAVEN_OPTS='-Xms1g -Xmx1g'" > ~/.mavenrc
+  - echo "MAVEN_OPTS='-Xms1g -Xmx1g'" > "$HOME/.mavenrc"
+  - mkdir -p "$HOME/.m2"
+  - cp .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
-matrix:
-  include:
-  - jdk: oraclejdk7
-    script: mvn test
-  - jdk: oraclejdk8
-    script:
-      - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn test deploy --settings .travis-settings.xml || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Deploy" )'
-      - '[ "${SHOULD_DEPLOY}" = "yes" ] || mvn test'
-      - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://nemo.sonarqube.org -Dsonar.login=${SONAR_TOKEN} || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Sonar" )'
+script:
+  - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn test deploy --settings .travis-settings.xml || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Deploy" )'
+  - '[ "${SHOULD_DEPLOY}" = "yes" ] || mvn test'
+  - '[ "${SHOULD_DEPLOY}" = "yes" ] && mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://nemo.sonarqube.org -Dsonar.login=${SONAR_TOKEN} || ( [ "${SHOULD_DEPLOY}" != "yes" ] && echo "Skipping Sonar" )'
 branches:
   except:
     - /^pmd_releases\/\d/
diff --git a/pom.xml b/pom.xml
index 6ada7d4978..5e7375b733 100644
--- a/pom.xml
+++ b/pom.xml
@@ -933,31 +933,6 @@
             </modules>
         </profile>
 
-        <profile>
-          <id>travis</id>
-          <activation>
-            <!-- https://github.com/travis-ci/travis-ci/issues/2727 -->
-            <!-- http://docs.travis-ci.com/user/ci-environment/#Environment-variables -->
-            <!-- from: https://github.com/marschall/jdeps-maven-plugin/blob/master/pom.xml -->
-            <property>
-              <name>env.TRAVIS</name>
-              <value>true</value>
-            </property>
-          </activation>
-          <build>
-            <plugins>
-              <plugin>
-                <artifactId>maven-toolchains-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <phase>none</phase>
-                  </execution>
-                </executions>
-              </plugin>
-            </plugins>
-          </build>
-        </profile>
-
         <profile>
             <id>site</id>
             <!--