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
diff --git a/.travis.yml b/.travis.yml
index 7cfe0df..f511713 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,8 @@
- 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
@@ -40,14 +38,10 @@
# 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
env: CONFIG=javanano_oracle7
diff --git a/tests.sh b/tests.sh
index 4b8ef2f..d112750 100755
--- a/tests.sh
+++ b/tests.sh
@@ -127,13 +127,10 @@
use_java() {
version=$1
case "$version" in
- jdk6)
- on_travis sudo apt-get install openjdk-6-jdk
- export PATH=/usr/lib/jvm/java-6-openjdk-amd64/bin:$PATH
- ;;
jdk7)
on_travis sudo apt-get install openjdk-7-jdk
export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
+ export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
;;
oracle7)
if [ "$TRAVIS" == "true" ]; then
@@ -144,6 +141,7 @@
yes | sudo apt-get install oracle-java7-installer
fi;
export PATH=/usr/lib/jvm/java-7-oracle/bin:$PATH
+ export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
;;
esac
@@ -154,6 +152,7 @@
which java
java -version
+ $MVN -version
}
# --batch-mode supresses download progress output that spams the logs.
@@ -186,10 +185,6 @@
cd javanano && $MVN test && cd ..
}
-build_java_jdk6() {
- use_java jdk6
- build_java jdk6
-}
build_java_jdk7() {
use_java jdk7
build_java_with_conformance_tests
@@ -199,10 +194,6 @@
build_java oracle7
}
-build_javanano_jdk6() {
- use_java jdk6
- build_javanano
-}
build_javanano_jdk7() {
use_java jdk7
build_javanano
@@ -346,10 +337,8 @@
Usage: $0 { cpp |
cpp_distcheck |
csharp |
- java_jdk6 |
java_jdk7 |
java_oracle7 |
- javanano_jdk6 |
javanano_jdk7 |
javanano_oracle7 |
objectivec_ios |
