[maven] 01/01: Use Windows/Maven 3.6.x for build step

[sl...@apache.org]

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

slachiewicz pushed a commit to branch maven36x
in repository https://gitbox.apache.org/repos/asf/maven.git

commit aff4e34b1b386f6b49fc4e04696f8578f09fad32
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Jan 23 21:00:20 2019 +0100

    Use Windows/Maven 3.6.x for build step
---
 Jenkinsfile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7c580cd..3a1087c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,12 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
 
-def buildOs = 'linux'
+def buildOs = 'windows'
 def buildJdk = '8'
-def buildMvn = '3.5.4'
+def buildMvn = '3.6.x'
 def runITsOses = ['linux', 'windows']
 def runITsJdks = ['7', '8', '11']
-def runITsMvn = '3.5.4'
+def runITsMvn = '3.6.x'
 def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests
 
@@ -51,7 +51,12 @@ node(jenkinsEnv.nodeSelection(osNode)) {
                 invokerPublisher(),
                 pipelineGraphPublisher()
             ]) {
-                sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true"
+                String cmd = "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true"
+                if (isUnix()) {
+                    sh "${cmd}"
+                } else {
+                    bat "${cmd}"
+                }
             }
             dir ('apache-maven/target') {
                 sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
@@ -117,6 +122,7 @@ parallel(runITsTasks)
 
 // JENKINS-34376 seems to make it hard to detect the aborted builds
 } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
+    echo "[FAILURE-002] FlowInterruptedException ${e}"
     // this ambiguous condition means a user probably aborted
     if (e.causes.size() == 0) {
         currentBuild.result = "ABORTED"
@@ -125,6 +131,7 @@ parallel(runITsTasks)
     }
     throw e
 } catch (hudson.AbortException e) {
+    echo "[FAILURE-003] AbortException ${e}"
     // this ambiguous condition means during a shell step, user probably aborted
     if (e.getMessage().contains('script returned exit code 143')) {
         currentBuild.result = "ABORTED"
@@ -133,9 +140,11 @@ parallel(runITsTasks)
     }
     throw e
 } catch (InterruptedException e) {
+    echo "[FAILURE-004] ${e}"
     currentBuild.result = "ABORTED"
     throw e
 } catch (Throwable e) {
+    echo "[FAILURE-001] ${e}"
     currentBuild.result = "FAILURE"
     throw e
 } finally {