travis normalization dist, language, jdk, docker install (#367)
diff --git a/.travis.yml b/.travis.yml
index 8569fcc..20bb704 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,11 +18,9 @@
# A Travis CI configuration file.
sudo: required
-
-language: scala
-scala:
- - 2.12.7
-
+dist: xenial
+jdk: openjdk8
+language: java
services:
- docker
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 8d6e599..8c63456 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -19,18 +19,6 @@
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
HOMEDIR="$SCRIPTDIR/../../.."
-sudo gpasswd -a travis docker
-sudo -E bash -c 'echo '\''DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --storage-driver=overlay --userns-remap=default"'\'' > /etc/default/docker'
-
-# Docker
-sudo apt-get -y update -qq
-sudo apt-get -o Dpkg::Options::="--force-confold" --force-yes -y install docker-engine=1.12.0-0~trusty
-sudo service docker restart
-echo "Docker Version:"
-docker version
-echo "Docker Info:"
-docker info
-
# jshint support
sudo apt-get -y install nodejs npm
sudo npm install -g jshint
