From f23e3096f36e017c60e9d16940065f07be166368 Mon Sep 17 00:00:00 2001
From: Tom Morris <tfmorris@gmail.com>
Date: Tue, 7 Jul 2020 15:41:55 -0400
Subject: [PATCH] Tweak CI build settings - refs #2861 (#2894)

* Sleep to wait for database servers on Mac - refs #2861

* Tweak JDK build settings (again) - refs #2861

- Use default JDK on platforms where possible
- Make problematic builds (requiring Java installs) optional
---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ed32bf36..0d39bddfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ dist: bionic
 jobs:
   include:
     - dist: trusty # Fastest build first
-      jdk: oraclejdk8
+      jdk: oraclejdk8 # Trusty default
+    - jdk: openjdk11 # Bionic default
     - jdk: openjdk13
-    - jdk: oraclejdk11
     - os: osx
       osx_image: xcode11.6 # macOS 10.15.4, Oracle JDK 14.0.1
       language: java
@@ -42,6 +42,9 @@ jobs:
   allow_failures:
     - jdk: openjdk-ea
     - jdk: oraclejdk-ea
+    # JDKs below need to be installed and installation fails frequently
+    - jdk: openjdk12
+    - jdk: openjdk13
 
 addons:
   mariadb: '10.3'