This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new d7b8b99 JaCoCo works with JDK 11 in Jenkinsfile
d7b8b99 is described below
commit d7b8b9926a033de355ee0ab5d7023dcb5139da4c
Author: Tibor17 <tibordig...@apache.org>
AuthorDate: Thu Oct 25 07:34:29 2018 +0200
JaCoCo works with JDK 11 in Jenkinsfile
---
Jenkinsfile | 11 ++---------
README.md | 4 ++--
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0098dd5..8d8fff2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,11 +50,8 @@ oses.eachWithIndex { osMapping, indexOfOs ->
// Referenses for TLS:
//
https://central.sonatype.org/articles/2018/May/04/discontinued-support-for-tlsv11-and-below/?__hstc=31049440.ab2fd229e7f8b6176196d9f78621e1f5.1534324377408.1534324377408.1534324377408.1&__hssc=31049440.1.1534324377409&__hsfp=2729160845
- def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation
-XX:TieredStopAtLevel=1 -XX:+UseNUMA \
+ def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation
-XX:TieredStopAtLevel=1 -XX:+UseNUMA -XX:+UseStringDeduplication \
-Xms64m -Djava.awt.headless=true -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2'
- if (jdk > 7) {
- mavenOpts += ' -XX:+UseStringDeduplication'
- }
mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
if (label == null || jdkTestName == null || mvnName == null) {
@@ -67,13 +64,9 @@ oses.eachWithIndex { osMapping, indexOfOs ->
stages[stageKey] = {
node(label) {
timestamps {
- //https://github.com/jacoco/jacoco/issues/629
- def boolean makeReports = os == 'linux' &&
indexOfMaven == mavens.size() - 1 && jdk == 9
+ def boolean makeReports = os == 'linux' &&
indexOfMaven == 0 && jdk == 11
def failsafeItPort = 8000 + 100 * indexOfMaven + 10 *
indexOfJdk
def allOptions = options +
["-Dfailsafe-integration-test-port=${failsafeItPort}",
"-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
- if (jdk == 11) {
- allOptions += ['-DskipUnitTests=true']
- }
buildProcess(stageKey, jdkName, jdkTestName, mvnName,
goals, allOptions, mavenOpts, makeReports)
}
}
diff --git a/README.md b/README.md
index 1fc5458..55736a9 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ But in order to run IT tests, you can do:
**(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 10** disable JaCoCo due to a [bug in
JaCoCo](https://github.com/jacoco/jacoco/issues/629)
- *mvn install site site:stage -P reporting,run-its -Djacoco.skip=true
"-Djdk.home=e:\Program Files\Java\jdk10\"*
+* In order to run the build with **JDK 11**:
+ *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program
Files\Java\jdk11\"*
### Deploying web site
