Skip to content

Commit

Permalink
[SQLLINE-434] Support JDK 14, 15, 16
Browse files Browse the repository at this point in the history
  • Loading branch information
snuyanzin committed May 16, 2021
1 parent fc48250 commit 8ce5a04
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 24 deletions.
28 changes: 11 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,25 @@ language: java
matrix:
fast_finish: true
include:
- env: IMAGE=maven:3-jdk-13
- env: IMAGE=maven:3-jdk-12
- env: IMAGE=maven:3-jdk-11 JDOC=Y
- env: IMAGE=maven:3-jdk-10
- env: IMAGE=maven:3-jdk-9
- env: IMAGE=maven:3-jdk-8 JDOC=Y
- jdk: openjdk16
- jdk: openjdk15
- jdk: openjdk14
- jdk: openjdk13
- jdk: openjdk12
- jdk: openjdk11
- jdk: openjdk10
- jdk: openjdk9
- jdk: openjdk8
branches:
only:
- master
- scratch
env:
global:
- DOCKERRUN="docker run -it --rm -v $PWD:/src -v $HOME/.m2:/root/.m2 -w /src"
services:
- docker
before_install:
- docker pull $IMAGE
install:
# Print the Maven version, skip tests and javadoc
- $DOCKERRUN $IMAGE mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Djavax.net.ssl.trustStorePassword=changeit -B -V
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Djavax.net.ssl.trustStorePassword=changeit -B -V
script:
# Print surefire output to the console instead of files
- unset _JAVA_OPTIONS
- if [ $JDOC = "Y" ]; then export JDOC=javadoc:javadoc; fi
- $DOCKERRUN $IMAGE mvn -Dcheckstyle.skip -Dsurefire.useFile=false -Dsurefire.threadCount=1 -Dsurefire.perCoreThreadCount=false -Djavax.net.ssl.trustStorePassword=changeit test $JDOC
- mvn -Dcheckstyle.skip -Dsurefire.useFile=false -Dsurefire.threadCount=1 -Dsurefire.perCoreThreadCount=false -Djavax.net.ssl.trustStorePassword=changeit test javadoc:javadoc
git:
depth: 10000
sudo: required
Expand Down
2 changes: 1 addition & 1 deletion HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Capitalization is tricky:

Make sure `mvn clean install`, `mvn site`, and
`mvn javadoc:javadoc javadoc:test-javadoc` pass under JDK 8, 9, 10,
11, 12, 13, 14, and 15.
11, 12, 13, 14, 15 and 16.

Write release notes. Run the
[relNotes](https://github.com/julianhyde/share/blob/master/tools/relNotes)
Expand Down
33 changes: 27 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Configuration for Appveyor CI
version: '{build}'
image: Visual Studio 2017
clone_depth: 10000
# branches to build
branches:
Expand All @@ -15,11 +14,33 @@ matrix:
fast_finish: true
environment:
matrix:
- JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- JAVA_HOME: C:\Program Files\Java\jdk9
- JAVA_HOME: C:\Program Files\Java\jdk10
- JAVA_HOME: C:\Program Files\Java\jdk11
- JAVA_HOME: C:\Program Files\Java\jdk12
- job_name: Windows jdk8
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk1.8.0
- job_name: Windows jdk9
appveyor_build_worker_image: Visual Studio 2017
JAVA_HOME: C:\Program Files\Java\jdk9
- job_name: Windows jdk10
appveyor_build_worker_image: Visual Studio 2017
JAVA_HOME: C:\Program Files\Java\jdk10
- job_name: Windows jdk11
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk11
- job_name: Windows jdk12
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk12
- job_name: Windows jdk13
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk13
- job_name: Windows jdk14
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk14
- job_name: Windows jdk15
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk15
- job_name: Windows jdk16
appveyor_build_worker_image: Visual Studio 2019
JAVA_HOME: C:\Program Files\Java\jdk16
build_script:
- mvn clean -V install -DskipTests -Dmaven.javadoc.skip=true -Djavax.net.ssl.trustStorePassword=changeit
test_script:
Expand Down

0 comments on commit 8ce5a04

Please sign in to comment.