Bläddra i källkod

Build Java conformance tests for JDK7 only.

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

[skip ci]
Feng Xiao 9 år sedan
förälder
incheckning
9e5fb55ed6
1 ändrade filer med 9 tillägg och 1 borttagningar
  1. 9 1
      travis.sh

+ 9 - 1
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