From 736ad33b6f1130bd8c4b5d1f639b8948c429daa4 Mon Sep 17 00:00:00 2001 From: Luke Bakken Date: Tue, 6 Dec 2016 08:59:50 -0800 Subject: [PATCH] Update tools/ to 1.3.1 and ensure JDK8 is used on Travis CI --- .travis.yml | 1 + tools | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 049f4033..f6687b8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: - RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.7/ubuntu/trusty/riak_2.0.7-1_amd64.deb - RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/ubuntu/trusty/riak_2.2.0-1_amd64.deb before_script: + - jdk_switcher use oraclejdk8 - sudo ./tools/travis-ci/riak-install -d "$RIAK_DOWNLOAD_URL" - sudo ./tools/setup-riak notifications: diff --git a/tools b/tools index 72939314..1fa90702 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit 72939314ab3151db776fcc01c92c26f6ee3dc499 +Subproject commit 1fa9070257c3443f04337e7e37ef083ed7ca2fe4