Merge pull request #2598 from ericvergnaud/use-openjdk

Use openjdk instead of oraclejdk
This commit is contained in:
Terence Parr 2019-07-14 10:25:56 -07:00 committed by GitHub
commit b627fffdd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions

1
.gitignore vendored
View File

@ -97,3 +97,4 @@ xcuserdata
# VSCode Java plugin temporary files
javac-services.0.log
javac-services.0.log.lck
test/

View File

@ -19,8 +19,9 @@ stages:
matrix:
include:
- os: linux
dist: trusty
compiler: clang
jdk: openjdk7
jdk: openjdk8
env:
- TARGET=cpp
- CXX=g++-5
@ -36,8 +37,9 @@ matrix:
- uuid-dev
- clang-3.7
- os: linux
dist: trusty
compiler: clang
jdk: openjdk7
jdk: openjdk8
env:
- TARGET=cpp
- CXX=g++-5
@ -53,8 +55,9 @@ matrix:
- uuid-dev
- clang-3.7
- os: linux
dist: trusty
compiler: clang
jdk: openjdk7
jdk: openjdk8
env:
- TARGET=cpp
- CXX=g++-5
@ -137,23 +140,20 @@ matrix:
- GROUP=RECURSION
stage: extended-test
- os: linux
dist: trusty
jdk: openjdk7
env: TARGET=java
stage: extended-test
- os: linux
jdk: openjdk8
env: TARGET=java
stage: extended-test
- os: linux
jdk: oraclejdk8
env: TARGET=java
stage: smoke-test
- os: linux
jdk: openjdk7
jdk: openjdk8
env: TARGET=csharp
stage: main-test
- os: linux
jdk: oraclejdk8
jdk: openjdk8
dist: trusty
env:
- TARGET=dotnet
@ -167,18 +167,18 @@ matrix:
- GROUP=PARSER
stage: extended-test
- os: linux
jdk: oraclejdk8
jdk: openjdk8
dist: trusty
env:
- TARGET=dotnet
- GROUP=RECURSION
stage: extended-test
- os: linux
jdk: openjdk7
jdk: openjdk8
env: TARGET=python2
stage: main-test
- os: linux
jdk: openjdk7
jdk: openjdk8
env: TARGET=python3
addons:
apt:

View File

@ -3,6 +3,6 @@
set -euo pipefail
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb http://download.mono-project.com/repo/debian xenial main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
sudo apt-get update -qq
echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/3.12.1 main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
sudo apt-get install -qq mono-complete

View File

@ -68,7 +68,8 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>[9.3.24.v20180605,)</version>
<!-- stick to version 9 for jdk compatibility -->
<version>9.4.19.v20190610</version>
<scope>test</scope>
</dependency>
<dependency>