[maven] branch maven36x updated (897a9c5 -> b16685e)

[sl...@apache.org]

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

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


    omit 897a9c5  Use Maven 3.6.0
     add bb3ec5d  [MNG-5995] Remove dependency to maven-compat (#185)
     new b16685e  Use Maven 3.6.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (897a9c5)
            \
             N -- N -- N   refs/heads/maven36x (b16685e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/maven/bridge/MavenRepositorySystem.java | 100 ++++++++++++++++++++-
 .../project/DefaultProjectBuildingHelper.java      |   6 +-
 2 files changed, 101 insertions(+), 5 deletions(-)

[maven] 01/01: Use Maven 3.6.0

[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 b16685e7d240a90689d97fb634ad8d70e830b233
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Jan 23 21:00:20 2019 +0100

    Use Maven 3.6.0
---
 Jenkinsfile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7c580cd..cbcb0b1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,10 +21,10 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e
 
 def buildOs = 'linux'
 def buildJdk = '8'
-def buildMvn = '3.5.4'
+def buildMvn = '3.6.0'
 def runITsOses = ['linux', 'windows']
 def runITsJdks = ['7', '8', '11']
-def runITsMvn = '3.5.4'
+def runITsMvn = '3.6.0'
 def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests
 
@@ -51,10 +51,15 @@ 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"
+                sh "mv apache-maven-*-bin.zip apache-maven-dist.zip" // Linux only cmd
                 stash includes: 'apache-maven-dist.zip', name: 'dist'
             }
         }
@@ -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 {