[jenkins][github][travis] build supports single JDK 9+ (GH JDK11 and TravisCI JDK14)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ccd2646..d7064af 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -17,7 +17,7 @@
name: GitHub CI
-on: [push, pull_request]
+on: [push]
jobs:
build:
@@ -33,10 +33,10 @@
- name: Checkout
uses: actions/checkout@v1
- - name: Set up JDK 1.8
+ - name: Set up JDK 11
uses: actions/setup-java@v1
with:
- java-version: 1.8
+ java-version: 11
- name: Build with Maven
- run: mvn install -e -B -V -nsu --no-transfer-progress -P run-its
\ No newline at end of file
+ run: mvn install -e -B -V -nsu --no-transfer-progress -P run-its
diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml
new file mode 100644
index 0000000..29f38e6
--- /dev/null
+++ b/.github/workflows/smoketest.yml
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Unit Tests
+
+on: [push]
+
+jobs:
+ build:
+ runs-on: macOS-latest
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v1
+
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+
+ - name: Build with Maven
+ run: mvn install -e -B -V -nsu --no-transfer-progress -P run-its -DskipITs
diff --git a/.travis.yml b/.travis.yml
index 39df7f2..ba10e50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@
- "$HOME/.m2"
install: true
-jdk: openjdk8
+jdk: openjdk14
jobs:
include:
diff --git a/README.md b/README.md
index ac15aaf..43259ff 100644
--- a/README.md
+++ b/README.md
@@ -46,14 +46,14 @@
# Development Information
-Build the Surefire project using **Maven 3.1.0+** and **JDK 1.8**.
+Build the Surefire project using **Maven 3.1.0+** and **JDK 1.8+**.
* In order to run tests for a release check during the Vote, the following memory requirements are needed:
**(on Linux/Unix)** *export MAVEN_OPTS="-server -Xmx512m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1"*
**(on Windows)** *set MAVEN_OPTS="-server -Xmx256m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1"*
-* In order to run the build with **JDK 9** **on Windows** (**on Linux/Unix modify system property jdk.home**):
- *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk9\"*
-* In order to run the build with **JDK 11**:
+* In order to run the tests with **JDK 1.7** (on Linux/Unix modify the system property **jdk.home**):
+ *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk1.7.0_80\"*
+* In order to run the build and the tests with **JDK 1.8+**, e.g. JDK 11:
*mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk11\"*
diff --git a/pom.xml b/pom.xml
index 87af8ac..3569f53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -616,7 +616,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-java</id>
@@ -627,8 +627,7 @@
<rules>
<requireJavaVersion>
<!-- We use JDK 1.8 to check -Xdoclint:all at compile time but with javac -source 1.7 -target 1.7 -->
- <!-- enforcer:1.3.1 fails on jdk9. 3.0.0-M2 does not but surefire:12.2.4 crashes later. -->
- <version>[1.8, 1.9)</version>
+ <version>[1.8, )</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -738,5 +737,14 @@
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[9, )</jdk>
+ </activation>
+ <properties>
+ <jdk.home>${java.home}</jdk.home>
+ </properties>
+ </profile>
</profiles>
</project>