buildscript: fix jdk-switcher bug always always setting jdk8 (#4652)

This fixes a bug that always hard codes jdk8.

Fixing this revealed an issue for jdk10, so let's remove jdk10
for now and revisit it in a separate PR.
This commit is contained in:
zpencer 2018-07-18 11:04:31 -07:00 committed by GitHub
parent 4335445d98
commit 603d858186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -14,8 +14,6 @@ before_install:
ln -s /tmp/gradle-caches-modules-2 $HOME/.gradle/caches/modules-2
- mkdir -p $HOME/.gradle &&
ln -s /tmp/gradle-wrapper $HOME/.gradle/wrapper
# Work around https://github.com/travis-ci/travis-ci/issues/2317
- if \[ "$TRAVIS_OS_NAME" = linux \]; then jdk_switcher use oraclejdk8; fi
- buildscripts/make_dependencies.sh # build protoc into /tmp/protobuf
- mkdir -p $HOME/.gradle
- echo "checkstyle.ignoreFailures=false" >> $HOME/.gradle/gradle.properties
@ -44,7 +42,6 @@ os:
jdk:
- oraclejdk8
- oraclejdk9
- oraclejdk10
notifications:
email: false

View File

@ -15,6 +15,9 @@
<protobuf.version>3.5.1</protobuf.version>
<protoc.version>3.5.1-1</protoc.version>
<netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
<dependencies>
<dependency>