diff --git a/travis.sh b/travis.sh index 61a8156d0c..20860652c4 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