From 74a0222e5686a2e28cfe517038e211fc62cc0dc0 Mon Sep 17 00:00:00 2001
From: Alex Osborne <aosborne@nla.gov.au>
Date: Fri, 2 Aug 2019 15:47:02 +0900
Subject: [PATCH] Travis fixes

- use trusty dist image for oraclejdk8 and openjdk7 as they're [unavailable] in the new xenial image
- jdk7: skip building contrib rather than allowing failures
- contrib is now in the parent pom so remove its separate build command
- start testing against openjdk11 but allow failures for now

[unavailable]: https://travis-ci.community/t/install-of-oracle-jdk-8-failing/3038/9
---
 .travis.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 43c4eec6..20978aa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,19 @@
+
 sudo: false
 
 language: java
-
-jdk:
- - oraclejdk8
- - openjdk7
- - openjdk8
-
 matrix:
-  allow_failures:
+  include:
+  - jdk: oraclejdk8
+    dist: trusty
   - jdk: openjdk7
-
+    dist: trusty
+    env: PROJECTS='--projects commons,modules,engine'
+  - jdk: openjdk8
+  - jdk: openjdk11
+  allow_failures:
+  - jdk: openjdk11
+  
 before_install:
  - "export JAVA_OPTS=-Xmx1500m"
  - "echo JAVA_OPTS=$JAVA_OPTS"
@@ -18,14 +21,15 @@ before_install:
  - "echo MAVEN_OPTS=$MAVEN_OPTS"
  - "export _JAVA_OPTIONS=-Xmx1500m"
  - "echo _JAVA_OPTIONS=$_JAVA_OPTIONS"
+ 
+install: mvn dependency:resolve -B -V $PROJECTS
 
 cache:
   directories:
   - $HOME/.m2
 
 script:
- - travis_wait 30 mvn install
- - cd contrib && mvn install
+ - travis_wait 30 mvn install $PROJECTS
 
 after_failure:
   - cat */target/surefire-reports/*.txt