From ad49ed78f3b0d03093274450637bd060d26fb58f Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Thu, 21 Jul 2016 11:37:46 -0700 Subject: Update travis tests for Java. 1. Set JAVA_HOME so mvn can pick up the correct java version. 2. Remove jdk6 tests. It has been broken for a while and remain undetected as mvn is actually using java 7 to build the code. Given that we have set -source and -target to 6 in the pom.xml and the built .jar should be usable by java 6, having a dedicated java 6 test doesn't seem necessary (assuming very few Java 6 users want to compile protobuf Java from source). Change-Id: I4f14da772632df3e47801f180198242b306c3f0f --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7cfe0dfb..f5117134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,8 @@ env: - CONFIG=cpp - CONFIG=cpp_distcheck - CONFIG=golang - - CONFIG=java_jdk6 - CONFIG=java_jdk7 - CONFIG=java_oracle7 - - CONFIG=javanano_jdk6 - CONFIG=javanano_jdk7 - CONFIG=javanano_oracle7 - CONFIG=javascript @@ -39,14 +37,10 @@ matrix: exclude: # It's nontrivial to programmatically install a new JDK from the command # line on OS X, so we rely on testing on Linux for Java code. - - os: osx - env: CONFIG=java_jdk6 - os: osx env: CONFIG=java_jdk7 - os: osx env: CONFIG=java_oracle7 - - os: osx - env: CONFIG=javanano_jdk6 - os: osx env: CONFIG=javanano_jdk7 - os: osx -- cgit v1.2.3