Skip to content

Commit

Permalink
Travis should use Open JDK instead of Oracle JDK
Browse files Browse the repository at this point in the history
  • Loading branch information
Vetle Leinonen-Roeim authored and vetler committed Jun 11, 2019
1 parent e93be0e commit 6ee48a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cache:
pip: true

jdk:
- oraclejdk8
- openjdk8

before_install:
- cp requirements.txt ..
Expand All @@ -43,8 +43,8 @@ install:
- pip install .

script:
- sudo apt-get update && sudo apt-get install oracle-java8-installer
- sudo apt-get update && sudo apt-get install openjdk-8-jdk
- java -version
- sudo update-alternatives --set java /usr/lib/jvm/java-8-oracle/jre/bin/java
- sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
- java -version
- ./travis-run.sh
2 changes: 1 addition & 1 deletion travis-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ common_node_settings() {

setup_es https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz

java_home='/usr/lib/jvm/java-8-oracle'
java_home='/usr/lib/jvm/java-8-openjdk-amd64/jre'

## Get major and minor version numbers
MAJORVER=$(echo $ES_VERSION | awk -F\. '{print $1}')
Expand Down

0 comments on commit 6ee48a4

Please sign in to comment.