Skip to content

Openjdk11 #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ language: java
matrix:
include:
- os: linux
jdk: openjdk10
jdk: openjdk11
env:
- INTEGRATION_TEST="integration"
- JDK=openjdk10
- JDK=openjdk11
- OS=linux
sudo: true
dist: xenial
Expand All @@ -32,9 +32,9 @@ matrix:
- os: osx
env:
- INTEGRATION_TEST="livelocal"
- JDK=openjdk10
- JDK=openjdk11
- OS=osx
osx_image: xcode9.4
osx_image: xcode10.1
script:
- ./src/liveTest/resources/scripts/create_symlinks;
- ./gradlew test liveTest -Dxenon.scheduler=local -Dxenon.filesystem=file -Dxenon.filesystem.location=/ -Dxenon.scheduler.location=$PWD -Dxenon.username=$USERNAME -Dxenon.filesystem.basedir=$PWD -Dxenon.filesystem.expected.workdir=/ -Dxenon.scheduler.workdir=$PWD -Dxenon.scheduler.supportsInteractive=1 -Dxenon.scheduler.isEmbedded=1
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: '{branch}-{build}'
environment:
JAVA_HOME: C:\Program Files\Java\jdk10
JAVA_HOME: C:\Program Files\Java\jdk11
build_script:
- SET "PATH=%JAVA_HOME%\bin;%PATH%"
- javac -version
Expand All @@ -13,7 +13,7 @@ test_script:
on_finish:
- SET "PATH=%JAVA_HOME%\bin;%PATH%"
- "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
- "SET JDK=openjdk10"
- "SET JDK=openjdk11"
- .\gradlew.bat jacocoTestReport jacocoLiveTestReport
- pip install codecov
- codecov -e OS,JDK -F unit -f build/reports/jacoco/test/jacocoTestReport.xml
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
// license
id 'com.github.hierynomus.license' version '0.14.0'
// test sets
id 'org.unbroken-dome.test-sets' version '1.5.0'
id 'org.unbroken-dome.test-sets' version '2.1.1'
}

// METADATA
Expand Down Expand Up @@ -86,7 +86,7 @@ dependencies {
testApiCompile group: 'junit', name: 'junit', version: '4.12'

integrationTestCompile sourceSets.testApi.output
integrationTestCompile 'com.palantir.docker.compose:docker-compose-rule-junit4:0.32.0'
integrationTestCompile 'com.palantir.docker.compose:docker-compose-rule-junit4:0.35.0'

// allow isolated and live tests to import from integration test,
// so abstract test classes and docker compose files can be extended and reused
Expand All @@ -96,7 +96,7 @@ dependencies {

// TODO fixedClientEnvironmentTest should have same dependencies as integrationTest,
// do no copy deps but append integrationTest.deps to fixedClientEnvironmentTest.deps
fixedClientEnvironmentTestCompile 'com.palantir.docker.compose:docker-compose-rule-junit4:0.32.0'
fixedClientEnvironmentTestCompile 'com.palantir.docker.compose:docker-compose-rule-junit4:0.35.0'

docGeneratorCompile sourceSets.main.output
docGeneratorRuntime configurations.runtime
Expand Down
10 changes: 2 additions & 8 deletions gradle/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ description = 'Xenon: a middleware abstraction library that provides a simple pr

// will generate a warning with JDK 8, since the runtime jar (rt.jar) of
// Java 7 is not available. Could configure gradle wrapper for this
sourceCompatibility = '1.9'
targetCompatibility = '1.9'
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

// PROJECT DIRECTORIES
// ==============
Expand Down Expand Up @@ -40,12 +40,6 @@ apply from: 'gradle/documentation.gradle'
apply from: 'gradle/distribution.gradle'
apply from: 'gradle/docker.gradle'

task wrapper(type: Wrapper) {
description 'Generates gradle wrapper'
group 'Build Setup'
gradleVersion = '4.1'
}

cleanIdeaWorkspace.group = 'IDE'
cleanIdeaWorkspace.description = 'Removes the IDEA workspace file'

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Feb 25 14:28:35 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
install:
- ./gradlew clean -Pgroup=$GROUP -Pversion=$VERSION publishToMavenLocal
jdk:
- openjdk9
- openjdk11