use OpenJDK 8

Author: Vladimir Kotal

.travis.yml

@@ -50,13 +50,13 @@ jobs:
     before_install: dev/before_install
     before_script: dev/before
   - stage: test
-    name: Windows + Oracle JDK 8
+    name: Windows + Open JDK 8
     # Use shell until Travis supports Java on Windows proper.
     language: shell
     os: windows
     install: true
     script: dev/main
-    before_install: dev/before_install
+    before_install: dev/before_install.windows openjdk8
     before_script: dev/before
   - stage: deploy
     name: Github Release

dev/before_install

@@ -72,20 +72,4 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 		echo "cannot install Universal ctags"
 		exit 1
 	fi
-elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-	choco install jdk8 -params 'installdir=c:\\jdk' -y
-	export JAVA_HOME=${JAVA_HOME:-/c/jdk}
-	export PATH=${JAVA_HOME}/bin:${PATH}
-
-	choco install maven
-
-	choco install universal-ctags
-	export PATH=${PATH}:/c/ProgramData/chocolatey/lib/universal-ctags/tools
-
-	choco install svn
-	export PATH=${PATH}:/c/Program\ Files\ \(x86\)/Subversion/bin
-
-	choco install python3
-	# needs to be before the default Python 2
-	export PATH=/c/Python38:${PATH}
 fi

dev/before_install.windows

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+[[ "$TRAVIS_OS_NAME" == "windows" ]] || exit 1
+
+JDK="$1"
+
+choco install $JDK -y
+
+choco install maven
+
+choco install universal-ctags
+export PATH=${PATH}:/c/ProgramData/chocolatey/lib/universal-ctags/tools
+
+choco install svn
+export PATH=${PATH}:/c/Program\ Files\ \(x86\)/Subversion/bin
+
+choco install python3
+# needs to be before the default Python 2
+export PATH=/c/Python38:${PATH}

dev/main

@@ -24,11 +24,15 @@ if [ "x$TRAVIS_REPO_SLUG" == "xoracle/opengrok" ]; then
 fi
 
 if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-	export JAVA_HOME=${JAVA_HOME:-/c/jdk}
+	JAVA_BASE="/c/Program Files/OpenJDK"
+	JDK_DIR=$(find "$JAVA_BASE/" -type d -name 'openjdk*' -maxdepth 1 | head -1)
+	export JAVA_HOME=${JAVA_HOME:-$JDK_DIR}
+	echo "JAVA_HOME set to $JAVA_HOME"
 	export PATH=${JAVA_HOME}/bin:${PATH}
 
 	export PATH=${PATH}:/c/ProgramData/chocolatey/lib/universal-ctags/tools
 	export PATH=${PATH}:/c/Program\ Files\ \(x86\)/Subversion/bin
+	export PATH=${PATH}:${JAVA_HOME}
 
 	# needs to be before the default Python 2
 	export PATH=/c/Python38:${PATH}