From 031efa6df21c568b19cc9a6d9bb4b1b874f5023d Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Tue, 18 Aug 2020 21:41:57 +0200
Subject: [PATCH] Update .travis.yml, linux.sh, and win.sh

---
 .travis.yml     | 2 +-
 travis/linux.sh | 8 ++++++--
 travis/win.sh   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4eaf79b..04e6c67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ addons:
     - gperf
     - php
     - cmake
-    - default-jdk
+    - openjdk-11-jdk-headless
     - g++
     - ccache
     - maven
diff --git a/travis/linux.sh b/travis/linux.sh
index dfb29fd..77928be 100644
--- a/travis/linux.sh
+++ b/travis/linux.sh
@@ -3,6 +3,10 @@
 mkdir $TRAVIS_BUILD_DIR/out
 cd src/main/jni
 
+sudo apt-get install openjdk-11-jdk-headless
+export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)"
+export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$(dpkg --print-architecture)/bin"
+
 export TD_SRC_DIR=${PWD}/td
 export TD_BIN_DIR=${PWD}/jtdlib/td
 export JAVA_SRC_DIR=$(dirname `pwd`)/java
@@ -17,14 +21,14 @@ cd jnibuild
 #export JAVA_HOME=/usr/lib/jvm/java-1.13.0-openjdk-amd64
 #export JAVA_INCLUDE_PATH=/usr/lib/jvm/java-1.13.0-openjdk-amd64/include/
 cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR}
-cmake --build . --target install -- -j4
+travis_wait 30 cmake --build . --target install -- -j4
 
 cd ../../../../../
 #mvn install -X
 
 cd src/main/jni/jtdlib/build
 cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. ..
-cmake --build . --target install -- -j4
+travis_wait 30 cmake --build . --target install -- -j4
 cd ..
 #rm -r jnibuild
 #rm -r build
diff --git a/travis/win.sh b/travis/win.sh
index 01e4da9..1407cf0 100644
--- a/travis/win.sh
+++ b/travis/win.sh
@@ -18,7 +18,7 @@ cd $TRAVIS_BUILD_DIR
 git clone https://github.com/Microsoft/vcpkg.git
 cd vcpkg
 ./bootstrap-vcpkg.bat
-./vcpkg.exe install openssl:x64-windows zlib:x64-windows
+travis_wait 30 ./vcpkg.exe install openssl:x64-windows zlib:x64-windows
 cd ..
 
 # openssl