From 30e35b2b11348e715461c82edde1d7044f6789d9 Mon Sep 17 00:00:00 2001 From: "David M. Lloyd" Date: Fri, 17 Jul 2020 07:41:23 -0500 Subject: [PATCH] Add support for Java 14 --- README.adoc | 2 ++ pom.xml | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/README.adoc b/README.adoc index 0b9022a..7ff2893 100644 --- a/README.adoc +++ b/README.adoc @@ -51,6 +51,7 @@ property or properties are set as needed: * `java10.home`: this property must be set to the location of a Java 10 JDK installation * `java11.home`: this property must be set to the location of a Java 11 JDK installation * `java12.home`: this property must be set to the location of a Java 12 JDK installation +* `java13.home`: this property must be set to the location of a Java 13 JDK installation In order to simplify development, it is recommended to project maintainers to set these properties in your personal Maven `settings.xml` file. @@ -201,5 +202,6 @@ Note that this configuration causes the default `JAVA_HOME` environment to be se |build-test-java10|Run tests for Java 10 when `java10.home` is set and JDK 11 or later is used.|<> |build-test-java11|Run tests for Java 11 when `java11.home` is set and JDK 12 or later is used.|<> |build-test-java12|Run tests for Java 12 when `java12.home` is set and JDK 13 or later is used.|<> +|build-test-java13|Run tests for Java 13 when `java13.home` is set and JDK 14 or later is used.|<> |=== diff --git a/pom.xml b/pom.xml index 1bbe294..fc91c96 100644 --- a/pom.xml +++ b/pom.xml @@ -1047,6 +1047,104 @@ + + + + java13-test + + [14,) + + java13.home + + + ${basedir}/build-test-java13 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + java13-test + test + + test + + + ${java13.home}/bin/java + ${project.build.directory}/classes/META-INF/versions/13 + + + + ${project.build.directory}/classes/META-INF/versions/12 + + + ${project.build.directory}/classes/META-INF/versions/11 + + + ${project.build.directory}/classes/META-INF/versions/10 + + + ${project.build.directory}/classes/META-INF/versions/9 + + ${project.build.outputDirectory} + + + + + + + + + + + + + java14-mr-build + + [14,) + + ${basedir}/src/main/java14 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + compile-java14 + compile + + compile + + + 14 + + ${project.basedir}/src/main/java14 + + true + + + + + + maven-jar-plugin + + + + true + + + + + + + +