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 5fefb35 build fix
5fefb35 is described below
commit 5fefb35d7b672aeb35e5c3969cb0e524ee026e10
Author: Tibor17 <tibordig...@apache.org>
AuthorDate: Thu Oct 25 20:41:36 2018 +0200
build fix
---
Jenkinsfile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8d8fff2..a26ab04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,8 +31,8 @@ properties(
)
final def oses = ['linux':'ubuntu && !H24', 'windows':'Windows']
-final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] :
['3.5.x']
-final def jdks = [7, 8, 11]
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.5.x', '3.3.x', '3.2.x'] :
['3.5.x']
+final def jdks = [11, 8, 7]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install', 'jacoco:report']
@@ -50,8 +50,7 @@ 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 -XX:+UseStringDeduplication \
--Xms64m -Djava.awt.headless=true -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2'
+ def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation
-XX:TieredStopAtLevel=1 -XX:+UseNUMA -Xms64m -Djava.awt.headless=true
-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2'
mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
if (label == null || jdkTestName == null || mvnName == null) {
@@ -64,7 +63,7 @@ oses.eachWithIndex { osMapping, indexOfOs ->
stages[stageKey] = {
node(label) {
timestamps {
- def boolean makeReports = os == 'linux' &&
indexOfMaven == 0 && jdk == 11
+ def boolean makeReports = indexOfOs = 0 &&
indexOfMaven == 0 && indexOfJdk == 0
def failsafeItPort = 8000 + 100 * indexOfMaven + 10 *
indexOfJdk
def allOptions = options +
["-Dfailsafe-integration-test-port=${failsafeItPort}",
"-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
buildProcess(stageKey, jdkName, jdkTestName, mvnName,
goals, allOptions, mavenOpts, makeReports)
