From 9e5fb55ed6616e47a1d2b57c3c2f7ac59242f0b0 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Mon, 21 Dec 2015 11:08:18 -0800
Subject: Build Java conformance tests for JDK7 only.

The Java conformance test class uses JDK7+ only syntaxes and can't compile with JDK6.

[skip ci]
---
 travis.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'travis.sh')

diff --git a/travis.sh b/travis.sh
index 61a8156d..20860652 100755
--- a/travis.sh
+++ b/travis.sh
@@ -100,6 +100,14 @@ use_java() {
 }
 
 build_java() {
+  # Java build needs `protoc`.
+  internal_build_cpp
+  cd java && mvn test && mvn install
+  cd util && mvn test
+  cd ../..
+}
+
+build_java_with_conformance_tests() {
   # Java build needs `protoc`.
   internal_build_cpp
   cd java && mvn test && mvn install
@@ -120,7 +128,7 @@ build_java_jdk6() {
 }
 build_java_jdk7() {
   use_java jdk7
-  build_java
+  build_java_with_conformance_tests
 }
 build_java_oracle7() {
   use_java oracle7
-- 
cgit v1.2.3