From 255039162ed52a2ed870e1e17c4ca5e75ba8943a Mon Sep 17 00:00:00 2001
From: Phokham Nonava <pn@nonava.com>
Date: Thu, 7 Jun 2018 22:19:41 +0200
Subject: [PATCH] Use Travis CI configuration from master

---
 .travis-toolchains.xml | 13 +------------
 .travis.yml            | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.travis-toolchains.xml b/.travis-toolchains.xml
index f1702234504..26d1703f788 100644
--- a/.travis-toolchains.xml
+++ b/.travis-toolchains.xml
@@ -17,17 +17,6 @@
   -->
 <toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <id>java7</id>
-      <version>1.7</version>
-      <vendor>oracle</vendor>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-7-oracle</jdkHome>
-    </configuration>
-  </toolchain>
   <toolchain>
     <type>jdk</type>
     <provides>
@@ -50,4 +39,4 @@
       <jdkHome>/usr/lib/jvm/java-9-oracle</jdkHome>
     </configuration>
   </toolchain>
-</toolchains>
\ No newline at end of file
+</toolchains>
diff --git a/.travis.yml b/.travis.yml
index d3441ea5532..fad54b664bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,23 +11,32 @@
 #   limitations under the License.
 
 language: java
-# sudo enabled because sudo vms have more memory: https://docs.travis-ci.com/user/ci-environment/
+# sudo enabled because sudo vms have more memory: https://docs.travis-ci.com/user/reference/overview/
 sudo: true
 # trusty required for oraclejdk9
 dist: trusty
 
 jdk:
-  - oraclejdk7
+  - oraclejdk8
+
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
+      - oracle-java9-installer
 
 env:
   global:
     JAVA_OPTS=-Xmx4g
 
+cache:
+  directories:
+    - "$HOME/.m2"
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/apache/logging/log4j
+
 install:
-  - ./mvnw --toolchains=./.travis-toolchains.xml install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+  - ./mvnw -t .travis-toolchains.xml install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 
 script:
-  - ./mvnw --toolchains=./.travis-toolchains.xml test -B
-
-after_success:
-  - ./mvnw --show-version -pl !log4j-bom jacoco:prepare-agent test jacoco:report coveralls:report
\ No newline at end of file
+  - ./mvnw -t .travis-toolchains.xml test -B -V