From 751444abf177fbe2023a8abbded1caed93df9c10 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 22 Jun 2017 08:37:11 +0200 Subject: [PATCH 1/2] Add JDK 7 to package list Change-Id: I54fb172b6433d5dac492652a297b6caf06fe59df --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7a8b16c2f19..8ee7bec8f7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ addons: - gtk-doc-tools - autoconf-archive - libgirepository1.0-dev + - openjdk-7-jdk + - openjdk-7-jre + services: - docker From 262f6f93294c4aab47500b87f434edebaa445927 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 22 Jun 2017 08:41:48 +0200 Subject: [PATCH 2/2] Switch to openjdk7 Change-Id: Ibeda12e87910e2047a4c9d972a86cb6f6e0eba2c --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ee7bec8f7f..a32562fdd19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,6 @@ addons: - gtk-doc-tools - autoconf-archive - libgirepository1.0-dev - - openjdk-7-jdk - - openjdk-7-jre services: - docker @@ -62,13 +60,13 @@ matrix: - $TRAVIS_BUILD_DIR/ci/travis_script_manylinux.sh - language: java os: linux - jdk: oraclejdk7 + jdk: openjdk7 script: - $TRAVIS_BUILD_DIR/ci/travis_script_java.sh - language: java os: linux env: ARROW_TEST_GROUP=integration - jdk: oraclejdk7 + jdk: openjdk7 before_script: - export CC="gcc-4.9" - export CXX="g++-4.9"