From 7577f3ebaca0897a9ff01d1553d4576487e1d2c3 Mon Sep 17 00:00:00 2001 From: Julian Hyde Date: Mon, 1 Apr 2019 13:42:31 -0700 Subject: [PATCH] [SQLLINE-287] Support JDK 12 Document JDK 12 as our preferred JDK version; anything as old as JDK 8 is fine. Use JDK 12 to build releases, and add JDK 12 to the list of JDKs to test each release on. Enable Travis on JDK 12. (Also enable Travis on JDK 13, which is still under development.) Enable AppVeyor on JDK 12. --- .travis.yml | 2 ++ HOWTO.md | 6 +++--- README.md | 2 +- appveyor.yml | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4aa31b90..6b37a28c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ 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 diff --git a/HOWTO.md b/HOWTO.md index 230e4a84..182fa099 100644 --- a/HOWTO.md +++ b/HOWTO.md @@ -11,8 +11,8 @@ Capitalization is tricky: ## How to make a release (for committers) Make sure `mvn clean install`, `mvn site`, and -`mvn javadoc:javadoc javadoc:test-javadoc` pass under JDK 8, 9, 10 and -11. +`mvn javadoc:javadoc javadoc:test-javadoc` pass under JDK 8, 9, 10, +11 and 12. Write release notes. Run the [relNotes](https://github.com/julianhyde/share/blob/master/tools/relNotes) @@ -21,7 +21,7 @@ script and append the output to [HISTORY.md](HISTORY.md). Update version numbers in README, README.md, src/docbkx/manual.xml, and the copyright date in NOTICE. -Switch to JDK 11. +Switch to JDK 12. Check that the sandbox is clean: diff --git a/README.md b/README.md index fc7b9308..9ec45473 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ Use the following definition to use `sqlline` in your maven project: Prerequisites: * Maven 3.2.5 or higher -* Java 8 or higher (10 preferred) +* Java 8 or higher (12 preferred) Check out and build: diff --git a/appveyor.yml b/appveyor.yml index 8a806abb..d9b64221 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,6 +19,7 @@ environment: - 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 build_script: - mvn clean -V install -DskipTests -Dmaven.javadoc.skip=true -Djavax.net.ssl.trustStorePassword=changeit test_script: