Adding openjdk8 testing from javaref branch

Author: mkitti

.travis.yml

@@ -3,6 +3,7 @@ os:
   - linux
   - osx
   - windows
+dist: bionic
 before_install:
   - source ${TRAVIS_BUILD_DIR}/test/windows_java.sh
 julia:
@@ -13,34 +14,32 @@ julia:
 env:
   - JULIA_COPY_STACKS=0
   - JULIA_COPY_STACKS=1
-  - JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_INIT=1
-  - JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_TEST=1
 
 jobs:
+  include:
+  - julia: 1
+    env: JULIA_COPY_STACKS=1 JAVA_HOME=/usr/local/lib/jvm/openjdk8
+    os: linux
+  - julia: 1
+    env: JULIA_COPY_STACKS=1 JAVA_HOME=/usr/local/lib/jvm/openjdk11
+    os: linux
+  - julia: 1
+    env: JULIA_COPY_STACKS=1
+    os: osx
+    osx_image: xcode9.3
+  - julia: 1
+    env: JULIA_COPY_STACKS=0 JAVA_PKG=openjdk8
+    os: windows
   exclude:
   - julia: 1.0
     env: JULIA_COPY_STACKS=0
-  - julia: 1.0
-    env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_INIT=1
-  - julia: 1.0
-    env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_TEST=1
-  - os: mac
-    env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_INIT=1
-  - os: mac
-    env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_TEST=1
-  - os: windows
-    env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_INIT=1
-  - os: windows
-    env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_TEST=1
   - julia: 1.0
     os: windows
     env: JULIA_COPY_STACKS=1
   allow_failures:
   - julia: nightly
   - os: windows
     env: JULIA_COPY_STACKS=1
-  - env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_INIT=1
-  - env: JULIA_COPY_STACKS=0 JAVACALL_FORCE_ASYNC_TEST=1
 
 branches:
   only:

test/windows_java.sh

@@ -3,9 +3,9 @@ if [ $TRAVIS_OS_NAME == "windows" ]; then
     #export JAVA_HOME=${JAVA_HOME:-/c/jdk}
     #export PATH=${JAVA_HOME}/bin:${PATH}
     #choco install jdk8 -params 'installdir=c:\\jdk' -y
-    choco install openjdk11
+    choco install ${JAVA_PKG:="openjdk11"}
     #export JAVA_HOME="C:\Program Files\OpenJDK\openjdk-11.0.5_10"
     JAVA_ROOT_DIR='C:\Program Files\OpenJDK\'
-    export JAVA_HOME=`find "$JAVA_ROOT_DIR" -name "openjdk-11*" | tail -n 1`
+    export JAVA_HOME=${JAVA_HOME:-`find "$JAVA_ROOT_DIR" -name "openjdk*" | tail -n 1`}
 fi
 echo "JAVA_HOME: "$JAVA_HOME