You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2022/12/15 23:03:12 UTC

[maven] branch maven-3.8.x updated: simplify

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

olamy pushed a commit to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.8.x by this push:
     new e82c41c30 simplify
e82c41c30 is described below

commit e82c41c302b04df6b39396a1186d91e601e33d18
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Dec 16 09:03:07 2022 +1000

    simplify
---
 Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 71cd00ee7..39087eba4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,12 +54,13 @@ node(jenkinsEnv.nodeSelection(osNode)) {
                          "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool "$mvnName"}/bin",
                          "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {                   
                     sh "mvn clean ${MAVEN_GOAL} -B -U -e -fae -V -Dmaven.test.failure.ignore -PversionlessMavenDist -Dmaven.repo.local=${WORK_DIR}/.repository"
-                    sh "mv apache-maven/target/apache-maven-bin.zip apache-maven-dist.zip"
-                    stash includes: 'apache-maven-dist.zip', name: 'dist'
                 }
             } finally {
                 junit testResults: '**/target/surefire-reports/*.xml', allowEmptyResults: true                
             }
+            dir ('apache-maven/target') {
+                stash includes: 'apache-maven-bin.zip', name: 'maven-dist'
+            }             
         }
     }
 }
@@ -93,7 +94,7 @@ for (String os in runITsOses) {
                             bat "if exist it-local-repo rmdir /s /q it-local-repo"
                             bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip"
                         }
-                        unstash 'dist'
+                        unstash 'maven-dist'
                         try {
                             withEnv(["JAVA_HOME=${ tool "$jdkName" }",
                                         "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool "$mvnName"}/bin",