This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch jdk13
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit e2e6d31018becfabe8285bd3de293a92b28feea2
Author: tibordigana <[email protected]>
AuthorDate: Sun Jan 20 00:52:51 2019 +0100

    testing JDK 13 with Maven 3+
---
 Jenkinsfile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e72aa96..5bbcf74 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ properties(
 
 final def oses = ['linux':'ubuntu && !H24', 'windows':'Windows']
 final def mavens = env.BRANCH_NAME == 'master' ? ['3.5.x', '3.3.x', '3.2.x'] : 
['3.5.x']
-final def jdks = env.BRANCH_NAME == 'master' ? [12, 11, 8, 7] : [11, 8, 7]
+final def jdks = env.BRANCH_NAME == 'master' ? [13, 8, 7] : [13, 7]
 
 final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
 final def goals = ['clean', 'install', 'jacoco:report']
@@ -55,23 +55,19 @@ oses.eachWithIndex { osMapping, indexOfOs ->
 
             if (label == null || jdkTestName == null || mvnName == null) {
                 println "Skipping ${stageKey} as unsupported by Jenkins 
Environment."
-                return;
+                return
             }
 
             println "${stageKey}  ==>  Label: ${label}, JDK: ${jdkTestName}, 
Maven: ${mvnName}."
 
             stages[stageKey] = {
                 node(label) {
-                    if (os == 'windows' && jdk == 12) {
-                        // https://issues.apache.org/jira/browse/INFRA-17384
-                        return
-                    }
                     timestamps {
-                        def boolean makeReports = indexOfOs == 0 && 
indexOfMaven == 0 && indexOfJdk == 0
+                        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}"]
                         if (jdk > 7) {
-                            allOptions += ['-DpowermockVersion=2.0.0-RC.4', 
'-Denforcer.skip=true']
+                            allOptions += ['-DpowermockVersion=2.0.0', 
'-Denforcer.skip=true']
                         }
                         ws(dir: "${os == 'windows' ? "${TEMP}\\${BUILD_TAG}" : 
pwd()}") {
                             buildProcess(stageKey, jdkName, jdkTestName, 
mvnName, goals, allOptions, mavenOpts, makeReports)

Reply via email to