Commit 9e5fb55e authored by Feng Xiao's avatar Feng Xiao

Build Java conformance tests for JDK7 only.

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

[skip ci]
parent d272cef2
...@@ -100,6 +100,14 @@ use_java() { ...@@ -100,6 +100,14 @@ use_java() {
} }
build_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`. # Java build needs `protoc`.
internal_build_cpp internal_build_cpp
cd java && mvn test && mvn install cd java && mvn test && mvn install
...@@ -120,7 +128,7 @@ build_java_jdk6() { ...@@ -120,7 +128,7 @@ build_java_jdk6() {
} }
build_java_jdk7() { build_java_jdk7() {
use_java jdk7 use_java jdk7
build_java build_java_with_conformance_tests
} }
build_java_oracle7() { build_java_oracle7() {
use_java oracle7 use_java oracle7
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment