From 78b4a488fc72b28919e3d7da8b0813e949284db3 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Thu, 11 Jul 2019 11:26:38 -0400
Subject: [PATCH] Fix travis-ci build with openjdk7

---
 .travis.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b9a5d6..44f65e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,21 @@
 language: java
 sudo: false
+dist: trusty
+
 addons:
   apt:
     packages:
-      - openjdk-6-jdk
-dist: trusty
-jdk:
-  - openjdk6
+      - ca-certificates-java
+      - openjdk-7-jre-headless
 
-install:
-  - if [[ "${TRAVIS_JDK_VERSION}" == 'openjdk6' ]]; then
-      export CUSTOM_MVN_VERION="3.2.5"
-      echo "Download Maven ${CUSTOM_MVN_VERION}....";
-      wget https://archive.apache.org/dist/maven/maven-3/${CUSTOM_MVN_VERION}/binaries/apache-maven-${CUSTOM_MVN_VERION}-bin.zip || travis_terminate 1;
-      unzip -qq apache-maven-${CUSTOM_MVN_VERION}-bin.zip || travis_terminate 1;
-      export M2_HOME=$PWD/apache-maven-${CUSTOM_MVN_VERION};
-      export PATH=$M2_HOME/bin:$PATH;
-      mvn -version;
-    fi
+jdk:
+  - openjdk7
 
 after_success:
-  - if [ "${TRAVIS_JDK_VERSION}" == 'openjdk8' ] || [ "${TRAVIS_JDK_VERSION}" == 'openjdk6' ]; then
-      mvn deploy --settings .travis-settings.xml -DskipTests=true -B || travis_terminate 1;
+  - if [[ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" == 'master' ]]; then
+    mvn deploy --settings .travis-settings.xml -DskipTests=true -B || travis_terminate 1;
     fi
+
+cache:
+  directories:
+    - $HOME/.m2